s/Mandrake/Mandriva/

1 files changed, 241 insertions, 230 deletions

diff --git a/po/rpmdrake.pot b/po/rpmdrake.pot
index c7b0346f..ac131d09 100644
--- a/po/rpmdrake.pot
+++ b/po/rpmdrake.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2005-04-18 11:38+0200\n"
+"POT-Creation-Date: 2005-05-05 22:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,7 +22,7 @@ msgstr ""
 #: ../edit-urpm-sources.pl:67
 #, c-format
 msgid ""
-"This step enables you to add sources from a Mandrakelinux web or FTP "
+"This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
 "\n"
 "There are two kinds of official mirrors. You can choose to add sources that\n"
@@ -50,7 +50,7 @@ msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
 "\n"
-"I need to contact the Mandrakesoft website to get the mirror list.\n"
+"I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
 "\n"
 "Is it ok to continue?"
@@ -112,7 +112,7 @@ msgstr ""
 msgid "Login:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:170 ../edit-urpm-sources.pl:459
+#: ../edit-urpm-sources.pl:170 ../edit-urpm-sources.pl:459 ../rpmdrake.pm:123
 #, c-format
 msgid "Password:"
 msgstr ""
@@ -163,9 +163,9 @@ msgstr ""
 #: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:414
 #: ../edit-urpm-sources.pl:476 ../edit-urpm-sources.pl:557
 #: ../edit-urpm-sources.pl:597 ../edit-urpm-sources.pl:655
-#: ../edit-urpm-sources.pl:794 ../rpmdrake:165 ../rpmdrake:697
-#: ../rpmdrake:1501 ../rpmdrake:1509 ../rpmdrake.pm:504 ../rpmdrake.pm:594
-#: ../rpmdrake.pm:663
+#: ../edit-urpm-sources.pl:794 ../rpmdrake:165 ../rpmdrake:701
+#: ../rpmdrake:1505 ../rpmdrake:1513 ../rpmdrake.pm:539 ../rpmdrake.pm:628
+#: ../rpmdrake.pm:697
 #, c-format
 msgid "Cancel"
 msgstr ""
@@ -175,9 +175,9 @@ msgstr ""
 #: ../edit-urpm-sources.pl:554 ../edit-urpm-sources.pl:596
 #: ../edit-urpm-sources.pl:648 ../edit-urpm-sources.pl:720
 #: ../edit-urpm-sources.pl:787 ../edit-urpm-sources.pl:840
-#: ../edit-urpm-sources.pl:990 ../rpmdrake:165 ../rpmdrake:697 ../rpmdrake:714
-#: ../rpmdrake:719 ../rpmdrake:1442 ../rpmdrake:1501 ../rpmdrake:1644
-#: ../rpmdrake.pm:192 ../rpmdrake.pm:249 ../rpmdrake.pm:504
+#: ../edit-urpm-sources.pl:990 ../rpmdrake:165 ../rpmdrake:701 ../rpmdrake:718
+#: ../rpmdrake:723 ../rpmdrake:1446 ../rpmdrake:1505 ../rpmdrake:1648
+#: ../rpmdrake.pm:114 ../rpmdrake.pm:224 ../rpmdrake.pm:281 ../rpmdrake.pm:539
 #, c-format
 msgid "Ok"
 msgstr ""
@@ -346,7 +346,7 @@ msgid "Add"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:635 ../edit-urpm-sources.pl:642
-#: ../edit-urpm-sources.pl:700 ../edit-urpm-sources.pl:955 ../rpmdrake:1177
+#: ../edit-urpm-sources.pl:700 ../edit-urpm-sources.pl:955 ../rpmdrake:1181
 #, c-format
 msgid "Remove"
 msgstr ""
@@ -381,8 +381,8 @@ msgstr ""
 msgid "Command"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:684 ../rpmdrake:364 ../rpmdrake:381 ../rpmdrake:512
-#: ../rpmdrake:625
+#: ../edit-urpm-sources.pl:684 ../rpmdrake:364 ../rpmdrake:382 ../rpmdrake:516
+#: ../rpmdrake:629
 #, c-format
 msgid "(none)"
 msgstr ""
@@ -409,7 +409,9 @@ msgstr ""
 
 #: ../edit-urpm-sources.pl:737
 #, c-format
-msgid "Keys"
+msgid ""
+"_:cryptographic keys\n"
+"Keys"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:756
@@ -469,7 +471,7 @@ msgstr ""
 msgid "Regenerate hdlist"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:898 ../rpmdrake.pm:587
+#: ../edit-urpm-sources.pl:898 ../rpmdrake.pm:621
 #, c-format
 msgid "Please wait, updating media..."
 msgstr ""
@@ -509,7 +511,7 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1002 ../gurpmi.addmedia:74 ../rpmdrake:1755
+#: ../edit-urpm-sources.pl:1002 ../gurpmi.addmedia:74 ../rpmdrake:1759
 #, c-format
 msgid ""
 "%s\n"
@@ -1118,148 +1120,148 @@ msgstr ""
 msgid "Video"
 msgstr ""
 
-#: ../rpmdrake:387 ../rpmdrake:529 ../rpmdrake:531
+#: ../rpmdrake:388 ../rpmdrake:533 ../rpmdrake:535
 #, c-format
 msgid "(Not available)"
 msgstr ""
 
-#: ../rpmdrake:416 ../rpmdrake:493
+#: ../rpmdrake:417 ../rpmdrake:497
 #, c-format
 msgid "Search results"
 msgstr ""
 
-#: ../rpmdrake:416
+#: ../rpmdrake:417
 #, c-format
 msgid "Search results (none)"
 msgstr ""
 
-#: ../rpmdrake:427 ../rpmdrake:451
+#: ../rpmdrake:428 ../rpmdrake:455
 #, c-format
 msgid "Please wait, searching..."
 msgstr ""
 
-#: ../rpmdrake:446 ../rpmdrake:572 ../rpmdrake:1231 ../rpmdrake:1542
-#: ../rpmdrake:1754
+#: ../rpmdrake:450 ../rpmdrake:576 ../rpmdrake:1235 ../rpmdrake:1546
+#: ../rpmdrake:1758
 #, c-format
 msgid "Rpmdrake"
 msgstr ""
 
-#: ../rpmdrake:456
+#: ../rpmdrake:460
 #, c-format
 msgid "Stop"
 msgstr ""
 
-#: ../rpmdrake:494 ../rpmdrake:660
+#: ../rpmdrake:498 ../rpmdrake:664
 #, c-format
 msgid "Upgradable"
 msgstr ""
 
-#: ../rpmdrake:494 ../rpmdrake:660
+#: ../rpmdrake:498 ../rpmdrake:664
 #, c-format
 msgid "Addable"
 msgstr ""
 
-#: ../rpmdrake:496
+#: ../rpmdrake:500
 #, c-format
 msgid "Selected"
 msgstr ""
 
-#: ../rpmdrake:496
+#: ../rpmdrake:500
 #, c-format
 msgid "Not selected"
 msgstr ""
 
-#: ../rpmdrake:526
+#: ../rpmdrake:530
 #, c-format
 msgid "Files:\n"
 msgstr ""
 
-#: ../rpmdrake:531
+#: ../rpmdrake:535
 #, c-format
 msgid "Changelog:\n"
 msgstr ""
 
-#: ../rpmdrake:536
+#: ../rpmdrake:540
 #, c-format
 msgid "Medium: "
 msgstr ""
 
-#: ../rpmdrake:538
+#: ../rpmdrake:542
 #, c-format
 msgid "Currently installed version: "
 msgstr ""
 
-#: ../rpmdrake:546
+#: ../rpmdrake:550
 #, c-format
 msgid "Name: "
 msgstr ""
 
-#: ../rpmdrake:547
+#: ../rpmdrake:551
 #, c-format
 msgid "Version: "
 msgstr ""
 
-#: ../rpmdrake:548
+#: ../rpmdrake:552
 #, c-format
 msgid "Size: "
 msgstr ""
 
-#: ../rpmdrake:548
+#: ../rpmdrake:552
 #, c-format
 msgid "%s KB"
 msgstr ""
 
-#: ../rpmdrake:551
+#: ../rpmdrake:555
 #, c-format
 msgid "Importance: "
 msgstr ""
 
-#: ../rpmdrake:554
+#: ../rpmdrake:558
 #, c-format
 msgid "Summary: "
 msgstr ""
 
-#: ../rpmdrake:557
+#: ../rpmdrake:561
 #, c-format
 msgid "Reason for update: "
 msgstr ""
 
-#: ../rpmdrake:559
+#: ../rpmdrake:563
 #, c-format
 msgid "Description: "
 msgstr ""
 
-#: ../rpmdrake:559
+#: ../rpmdrake:563
 #, c-format
 msgid "No description"
 msgstr ""
 
-#: ../rpmdrake:588 ../rpmdrake:710 ../rpmdrake:712 ../rpmdrake:1634
+#: ../rpmdrake:592 ../rpmdrake:714 ../rpmdrake:716 ../rpmdrake:1638
 #, c-format
 msgid "More information on package..."
 msgstr ""
 
-#: ../rpmdrake:589
+#: ../rpmdrake:593
 #, c-format
 msgid "Please choose"
 msgstr ""
 
-#: ../rpmdrake:589
+#: ../rpmdrake:593
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr ""
 
-#: ../rpmdrake:610
+#: ../rpmdrake:614
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr ""
 
-#: ../rpmdrake:627
+#: ../rpmdrake:631
 #, c-format
 msgid "No update"
 msgstr ""
 
-#: ../rpmdrake:628
+#: ../rpmdrake:632
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1267,28 +1269,28 @@ msgid ""
 "or you already installed all of them."
 msgstr ""
 
-#: ../rpmdrake:651
+#: ../rpmdrake:655
 #, c-format
 msgid "All"
 msgstr ""
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:697 ../rpmdrake:702
+#: ../rpmdrake:701 ../rpmdrake:706
 #, c-format
 msgid "More info"
 msgstr ""
 
-#: ../rpmdrake:705 ../rpmdrake:1623
+#: ../rpmdrake:709 ../rpmdrake:1627
 #, c-format
 msgid "Information on packages"
 msgstr ""
 
-#: ../rpmdrake:727
+#: ../rpmdrake:731
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr ""
 
-#: ../rpmdrake:728
+#: ../rpmdrake:732
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1296,19 +1298,19 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../rpmdrake:734 ../rpmdrake:743
+#: ../rpmdrake:738 ../rpmdrake:747
 #, c-format
 msgid "Some packages can't be removed"
 msgstr ""
 
-#: ../rpmdrake:735
+#: ../rpmdrake:739
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake:744 ../rpmdrake:806
+#: ../rpmdrake:748 ../rpmdrake:810
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1316,12 +1318,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../rpmdrake:773
+#: ../rpmdrake:777
 #, c-format
 msgid "Additional packages needed"
 msgstr ""
 
-#: ../rpmdrake:774
+#: ../rpmdrake:778
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1329,17 +1331,17 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../rpmdrake:789
+#: ../rpmdrake:793
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr ""
 
-#: ../rpmdrake:791
+#: ../rpmdrake:795
 #, c-format
 msgid "Some packages can't be installed"
 msgstr ""
 
-#: ../rpmdrake:792
+#: ../rpmdrake:796
 #, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1347,122 +1349,122 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake:805 ../rpmdrake:1071
+#: ../rpmdrake:809 ../rpmdrake:1075
 #, c-format
 msgid "Some packages need to be removed"
 msgstr ""
 
-#: ../rpmdrake:830
+#: ../rpmdrake:834
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr ""
 
-#: ../rpmdrake:831
+#: ../rpmdrake:835
 #, c-format
 msgid "Selected size: %d MB"
 msgstr ""
 
-#: ../rpmdrake:837
+#: ../rpmdrake:841
 #, c-format
 msgid "Description not available for this package\n"
 msgstr ""
 
-#: ../rpmdrake:904
+#: ../rpmdrake:908
 #, c-format
 msgid "Security updates"
 msgstr ""
 
-#: ../rpmdrake:904
+#: ../rpmdrake:908
 #, c-format
 msgid "Bugfixes updates"
 msgstr ""
 
-#: ../rpmdrake:904
+#: ../rpmdrake:908
 #, c-format
 msgid "Normal updates"
 msgstr ""
 
-#: ../rpmdrake:924
+#: ../rpmdrake:928
 #, c-format
 msgid "%s choices"
 msgstr ""
 
-#: ../rpmdrake:924
+#: ../rpmdrake:928
 #, c-format
-msgid "Mandrakelinux choices"
+msgid "Mandriva Linux choices"
 msgstr ""
 
-#: ../rpmdrake:927
+#: ../rpmdrake:931
 #, c-format
 msgid "All packages, alphabetical"
 msgstr ""
 
-#: ../rpmdrake:935
+#: ../rpmdrake:939
 #, c-format
 msgid "All packages, by group"
 msgstr ""
 
-#: ../rpmdrake:936
+#: ../rpmdrake:940
 #, c-format
 msgid "All packages, by size"
 msgstr ""
 
-#: ../rpmdrake:937
+#: ../rpmdrake:941
 #, c-format
 msgid "All packages, by selection state"
 msgstr ""
 
-#: ../rpmdrake:941
+#: ../rpmdrake:945
 #, c-format
 msgid "All packages, by medium repository"
 msgstr ""
 
-#: ../rpmdrake:942
+#: ../rpmdrake:946
 #, c-format
 msgid "All packages, by update availability"
 msgstr ""
 
-#: ../rpmdrake:946
+#: ../rpmdrake:950
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr ""
 
-#: ../rpmdrake:1020
+#: ../rpmdrake:1024
 #, c-format
 msgid "in names"
 msgstr ""
 
-#: ../rpmdrake:1022
+#: ../rpmdrake:1026
 #, c-format
 msgid "in descriptions"
 msgstr ""
 
-#: ../rpmdrake:1024
+#: ../rpmdrake:1028
 #, c-format
 msgid "in file names"
 msgstr ""
 
-#: ../rpmdrake:1033
+#: ../rpmdrake:1037
 #, c-format
 msgid "Normal information"
 msgstr ""
 
-#: ../rpmdrake:1033
+#: ../rpmdrake:1037
 #, c-format
 msgid "Maximum information"
 msgstr ""
 
-#: ../rpmdrake:1053
+#: ../rpmdrake:1057
 #, c-format
 msgid "You need to select some packages first."
 msgstr ""
 
-#: ../rpmdrake:1058
+#: ../rpmdrake:1062
 #, c-format
 msgid "Too many packages are selected"
 msgstr ""
 
-#: ../rpmdrake:1059
+#: ../rpmdrake:1063
 #, c-format
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
@@ -1473,7 +1475,7 @@ msgid ""
 "Do you really want to install all the selected packages?"
 msgstr ""
 
-#: ../rpmdrake:1072
+#: ../rpmdrake:1076
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1483,98 +1485,98 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake:1105
+#: ../rpmdrake:1109
 #, c-format
 msgid "Software Packages Removal"
 msgstr ""
 
-#: ../rpmdrake:1106
+#: ../rpmdrake:1110
 #, c-format
 msgid "Software Packages Update"
 msgstr ""
 
-#: ../rpmdrake:1107
+#: ../rpmdrake:1111
 #, c-format
 msgid "Software Packages Installation"
 msgstr ""
 
-#: ../rpmdrake:1113 ../rpmdrake:1116 ../rpmdrake:1125 ../rpmdrake:1136
-#: ../rpmdrake:1141
+#: ../rpmdrake:1117 ../rpmdrake:1120 ../rpmdrake:1129 ../rpmdrake:1140
+#: ../rpmdrake:1145
 #, c-format
 msgid "/_File"
 msgstr ""
 
-#: ../rpmdrake:1116
+#: ../rpmdrake:1120
 #, c-format
 msgid "/_Update media"
 msgstr ""
 
-#: ../rpmdrake:1125
+#: ../rpmdrake:1129
 #, c-format
 msgid "/_Reset the selection"
 msgstr ""
 
-#: ../rpmdrake:1136
+#: ../rpmdrake:1140
 #, c-format
 msgid "/Reload the _packages list"
 msgstr ""
 
-#: ../rpmdrake:1141
+#: ../rpmdrake:1145
 #, c-format
 msgid "/_Quit"
 msgstr ""
 
-#: ../rpmdrake:1141
+#: ../rpmdrake:1145
 #, c-format
 msgid "<control>Q"
 msgstr ""
 
-#: ../rpmdrake:1144 ../rpmdrake:1145 ../rpmdrake:1152
+#: ../rpmdrake:1148 ../rpmdrake:1149 ../rpmdrake:1156
 #, c-format
 msgid "/_Options"
 msgstr ""
 
-#: ../rpmdrake:1145 ../rpmdrake:1152
+#: ../rpmdrake:1149 ../rpmdrake:1156
 #, c-format
 msgid "/_Show automatically selected packages"
 msgstr ""
 
-#: ../rpmdrake:1149 ../rpmdrake:1150
+#: ../rpmdrake:1153 ../rpmdrake:1154
 #, c-format
 msgid "/_Help"
 msgstr ""
 
-#: ../rpmdrake:1166
+#: ../rpmdrake:1170
 #, c-format
 msgid "Find:"
 msgstr ""
 
-#: ../rpmdrake:1171
+#: ../rpmdrake:1175
 #, c-format
 msgid "Search"
 msgstr ""
 
-#: ../rpmdrake:1177
+#: ../rpmdrake:1181
 #, c-format
 msgid "Install"
 msgstr ""
 
-#: ../rpmdrake:1182
+#: ../rpmdrake:1186
 #, c-format
 msgid "Quit"
 msgstr ""
 
-#: ../rpmdrake:1223
+#: ../rpmdrake:1227
 #, c-format
 msgid "Fatal error"
 msgstr ""
 
-#: ../rpmdrake:1224
+#: ../rpmdrake:1228
 #, c-format
 msgid "A fatal error occurred: %s."
 msgstr ""
 
-#: ../rpmdrake:1232
+#: ../rpmdrake:1236
 #, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
@@ -1583,12 +1585,12 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake:1241
+#: ../rpmdrake:1245
 #, c-format
 msgid "Already existing update media"
 msgstr ""
 
-#: ../rpmdrake:1242
+#: ../rpmdrake:1246
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -1599,12 +1601,12 @@ msgid ""
 "Then, restart %s."
 msgstr ""
 
-#: ../rpmdrake:1252
+#: ../rpmdrake:1256
 #, c-format
 msgid "How to choose manually your mirror"
 msgstr ""
 
-#: ../rpmdrake:1253
+#: ../rpmdrake:1257
 #, c-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
@@ -1614,62 +1616,62 @@ msgid ""
 "Then, restart %s."
 msgstr ""
 
-#: ../rpmdrake:1286
+#: ../rpmdrake:1290
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr ""
 
-#: ../rpmdrake:1364
+#: ../rpmdrake:1368
 #, c-format
 msgid "Inspecting %s"
 msgstr ""
 
-#: ../rpmdrake:1387
+#: ../rpmdrake:1391
 #, c-format
 msgid "changes:"
 msgstr ""
 
-#: ../rpmdrake:1395
+#: ../rpmdrake:1399
 #, c-format
 msgid "Remove .%s"
 msgstr ""
 
-#: ../rpmdrake:1399
+#: ../rpmdrake:1403
 #, c-format
 msgid "Use .%s as main file"
 msgstr ""
 
-#: ../rpmdrake:1403
+#: ../rpmdrake:1407
 #, c-format
 msgid "Do nothing"
 msgstr ""
 
-#: ../rpmdrake:1419
+#: ../rpmdrake:1423
 #, c-format
 msgid "Installation finished"
 msgstr ""
 
-#: ../rpmdrake:1434
+#: ../rpmdrake:1438
 #, c-format
 msgid "Inspect..."
 msgstr ""
 
-#: ../rpmdrake:1464 ../rpmdrake:1619
+#: ../rpmdrake:1468 ../rpmdrake:1623
 #, c-format
 msgid "Everything installed successfully"
 msgstr ""
 
-#: ../rpmdrake:1465 ../rpmdrake:1620
+#: ../rpmdrake:1469 ../rpmdrake:1624
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr ""
 
-#: ../rpmdrake:1467 ../rpmdrake:1604
+#: ../rpmdrake:1471 ../rpmdrake:1608
 #, c-format
 msgid "Problem during installation"
 msgstr ""
 
-#: ../rpmdrake:1468 ../rpmdrake:1605 ../rpmdrake:1660
+#: ../rpmdrake:1472 ../rpmdrake:1609 ../rpmdrake:1664
 #, c-format
 msgid ""
 "There was a problem during the installation:\n"
@@ -1677,17 +1679,17 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake:1481
+#: ../rpmdrake:1485
 #, c-format
 msgid "Unable to get source packages."
 msgstr ""
 
-#: ../rpmdrake:1482
+#: ../rpmdrake:1486
 #, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr ""
 
-#: ../rpmdrake:1483 ../rpmdrake:1554
+#: ../rpmdrake:1487 ../rpmdrake:1558
 #, c-format
 msgid ""
 "\n"
@@ -1696,37 +1698,37 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake:1490
+#: ../rpmdrake:1494
 #, c-format
 msgid "Package installation..."
 msgstr ""
 
-#: ../rpmdrake:1490
+#: ../rpmdrake:1494
 #, c-format
 msgid "Initializing..."
 msgstr ""
 
-#: ../rpmdrake:1499
+#: ../rpmdrake:1503
 #, c-format
 msgid "Change medium"
 msgstr ""
 
-#: ../rpmdrake:1500
+#: ../rpmdrake:1504
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
 
-#: ../rpmdrake:1507
+#: ../rpmdrake:1511
 #, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../rpmdrake:1530
+#: ../rpmdrake:1534
 #, c-format
 msgid "Verifying package signatures..."
 msgstr ""
 
-#: ../rpmdrake:1543
+#: ../rpmdrake:1547
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -1736,12 +1738,12 @@ msgid ""
 "Do you want to continue installation?"
 msgstr ""
 
-#: ../rpmdrake:1551 ../rpmdrake:1659
+#: ../rpmdrake:1555 ../rpmdrake:1663
 #, c-format
 msgid "Installation failed"
 msgstr ""
 
-#: ../rpmdrake:1552
+#: ../rpmdrake:1556
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1750,22 +1752,22 @@ msgid ""
 "You may want to update your media database."
 msgstr ""
 
-#: ../rpmdrake:1565
+#: ../rpmdrake:1569
 #, c-format
 msgid "Preparing packages installation..."
 msgstr ""
 
-#: ../rpmdrake:1568
+#: ../rpmdrake:1572
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../rpmdrake:1584
+#: ../rpmdrake:1588
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: ../rpmdrake:1617
+#: ../rpmdrake:1621
 #, c-format
 msgid ""
 "The installation is finished; %s.\n"
@@ -1774,47 +1776,47 @@ msgid ""
 "you may now inspect some in order to take actions:"
 msgstr ""
 
-#: ../rpmdrake:1617
+#: ../rpmdrake:1621
 #, c-format
 msgid "everything was installed correctly"
 msgstr ""
 
-#: ../rpmdrake:1625
+#: ../rpmdrake:1629
 #, c-format
 msgid "These packages come with upgrade information"
 msgstr ""
 
-#: ../rpmdrake:1637
+#: ../rpmdrake:1641
 #, c-format
 msgid "More information on package... [%s]"
 msgstr ""
 
-#: ../rpmdrake:1650
+#: ../rpmdrake:1654
 #, c-format
 msgid "No package found for installation."
 msgstr ""
 
-#: ../rpmdrake:1651
+#: ../rpmdrake:1655
 #, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr ""
 
-#: ../rpmdrake:1673
+#: ../rpmdrake:1677
 #, c-format
 msgid "Please wait, reading packages database..."
 msgstr ""
 
-#: ../rpmdrake:1720
+#: ../rpmdrake:1724
 #, c-format
 msgid "Please wait, removing packages..."
 msgstr ""
 
-#: ../rpmdrake:1725
+#: ../rpmdrake:1729
 #, c-format
 msgid "Problem during removal"
 msgstr ""
 
-#: ../rpmdrake:1726
+#: ../rpmdrake:1730
 #, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
@@ -1822,7 +1824,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake:1759
+#: ../rpmdrake:1763
 #, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
@@ -1831,7 +1833,7 @@ msgid ""
 "your computer."
 msgstr ""
 
-#: ../rpmdrake:1764
+#: ../rpmdrake:1768
 #, c-format
 msgid ""
 "Welcome to %s!\n"
@@ -1840,198 +1842,208 @@ msgid ""
 "computer."
 msgstr ""
 
-#: ../rpmdrake:1769
+#: ../rpmdrake:1773
 #, c-format
 msgid "Welcome to the software installation tool!"
 msgstr ""
 
-#: ../rpmdrake:1770
+#: ../rpmdrake:1774
 #, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
-"Your Mandrakelinux system comes with several thousands of software\n"
+"Your Mandriva Linux system comes with several thousands of software\n"
 "packages on CDROM or DVD. This tool will help you choose which software\n"
 "you want to install on your computer."
 msgstr ""
 
-#: ../rpmdrake.pm:94
+#: ../rpmdrake.pm:95
 #, c-format
 msgid "Software Update"
 msgstr ""
 
-#: ../rpmdrake.pm:94
+#: ../rpmdrake.pm:95
+#, c-format
+msgid "Mandriva Linux Update"
+msgstr ""
+
+#: ../rpmdrake.pm:122
+#, c-format
+msgid "Please enter your credentials for accessing proxy\n"
+msgstr ""
+
+#: ../rpmdrake.pm:123
 #, c-format
-msgid "Mandrakelinux Update"
+msgid "User name:"
 msgstr ""
 
-#: ../rpmdrake.pm:183
+#: ../rpmdrake.pm:215
 #, c-format
 msgid "No"
 msgstr ""
 
-#: ../rpmdrake.pm:187
+#: ../rpmdrake.pm:219
 #, c-format
 msgid "Yes"
 msgstr ""
 
-#: ../rpmdrake.pm:235
+#: ../rpmdrake.pm:267
 #, c-format
 msgid "Info..."
 msgstr ""
 
-#: ../rpmdrake.pm:311
+#: ../rpmdrake.pm:343
 #, c-format
 msgid "Austria"
 msgstr ""
 
-#: ../rpmdrake.pm:312
+#: ../rpmdrake.pm:344
 #, c-format
 msgid "Australia"
 msgstr ""
 
-#: ../rpmdrake.pm:313
+#: ../rpmdrake.pm:345
 #, c-format
 msgid "Belgium"
 msgstr ""
 
-#: ../rpmdrake.pm:314
+#: ../rpmdrake.pm:346
 #, c-format
 msgid "Brazil"
 msgstr ""
 
-#: ../rpmdrake.pm:315
+#: ../rpmdrake.pm:347
 #, c-format
 msgid "Canada"
 msgstr ""
 
-#: ../rpmdrake.pm:316
+#: ../rpmdrake.pm:348
 #, c-format
 msgid "Switzerland"
 msgstr ""
 
-#: ../rpmdrake.pm:317
+#: ../rpmdrake.pm:349
 #, c-format
 msgid "Costa Rica"
 msgstr ""
 
-#: ../rpmdrake.pm:318
+#: ../rpmdrake.pm:350
 #, c-format
 msgid "Czech Republic"
 msgstr ""
 
-#: ../rpmdrake.pm:319
+#: ../rpmdrake.pm:351
 #, c-format
 msgid "Germany"
 msgstr ""
 
-#: ../rpmdrake.pm:320
+#: ../rpmdrake.pm:352
 #, c-format
 msgid "Danmark"
 msgstr ""
 
-#: ../rpmdrake.pm:321 ../rpmdrake.pm:325
+#: ../rpmdrake.pm:353 ../rpmdrake.pm:357
 #, c-format
 msgid "Greece"
 msgstr ""
 
-#: ../rpmdrake.pm:322
+#: ../rpmdrake.pm:354
 #, c-format
 msgid "Spain"
 msgstr ""
 
-#: ../rpmdrake.pm:323
+#: ../rpmdrake.pm:355
 #, c-format
 msgid "Finland"
 msgstr ""
 
-#: ../rpmdrake.pm:324
+#: ../rpmdrake.pm:356
 #, c-format
 msgid "France"
 msgstr ""
 
-#: ../rpmdrake.pm:326
+#: ../rpmdrake.pm:358
 #, c-format
 msgid "Hungary"
 msgstr ""
 
-#: ../rpmdrake.pm:327
+#: ../rpmdrake.pm:359
 #, c-format
 msgid "Israel"
 msgstr ""
 
-#: ../rpmdrake.pm:328
+#: ../rpmdrake.pm:360
 #, c-format
 msgid "Italy"
 msgstr ""
 
-#: ../rpmdrake.pm:329
+#: ../rpmdrake.pm:361
 #, c-format
 msgid "Japan"
 msgstr ""
 
-#: ../rpmdrake.pm:330
+#: ../rpmdrake.pm:362
 #, c-format
 msgid "Korea"
 msgstr ""
 
-#: ../rpmdrake.pm:331
+#: ../rpmdrake.pm:363
 #, c-format
 msgid "Netherlands"
 msgstr ""
 
-#: ../rpmdrake.pm:332
+#: ../rpmdrake.pm:364
 #, c-format
 msgid "Norway"
 msgstr ""
 
-#: ../rpmdrake.pm:333
+#: ../rpmdrake.pm:365
 #, c-format
 msgid "Poland"
 msgstr ""
 
-#: ../rpmdrake.pm:334
+#: ../rpmdrake.pm:366
 #, c-format
 msgid "Portugal"
 msgstr ""
 
-#: ../rpmdrake.pm:335
+#: ../rpmdrake.pm:367
 #, c-format
 msgid "Russia"
 msgstr ""
 
-#: ../rpmdrake.pm:336
+#: ../rpmdrake.pm:368
 #, c-format
 msgid "Sweden"
 msgstr ""
 
-#: ../rpmdrake.pm:337
+#: ../rpmdrake.pm:369
 #, c-format
 msgid "Slovakia"
 msgstr ""
 
-#: ../rpmdrake.pm:338
+#: ../rpmdrake.pm:370
 #, c-format
 msgid "Taiwan"
 msgstr ""
 
-#: ../rpmdrake.pm:339
+#: ../rpmdrake.pm:371
 #, c-format
 msgid "United Kingdom"
 msgstr ""
 
-#: ../rpmdrake.pm:340
+#: ../rpmdrake.pm:372
 #, c-format
 msgid "China"
 msgstr ""
 
-#: ../rpmdrake.pm:341 ../rpmdrake.pm:342 ../rpmdrake.pm:343 ../rpmdrake.pm:344
-#: ../rpmdrake.pm:421
+#: ../rpmdrake.pm:373 ../rpmdrake.pm:374 ../rpmdrake.pm:375 ../rpmdrake.pm:376
+#: ../rpmdrake.pm:453
 #, c-format
 msgid "United States"
 msgstr ""
 
-#: ../rpmdrake.pm:433
+#: ../rpmdrake.pm:468
 #, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
@@ -2040,32 +2052,31 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake.pm:437
+#: ../rpmdrake.pm:472
 #, c-format
 msgid ""
-"I need to contact the Mandrakesoft website to get the mirror list.\n"
+"I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
 "\n"
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake.pm:443
+#: ../rpmdrake.pm:478
 #, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr ""
 
-#: ../rpmdrake.pm:444
+#: ../rpmdrake.pm:479
 #, c-format
-msgid ""
-"Please wait, downloading mirror addresses from the Mandrakesoft website."
+msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr ""
 
-#: ../rpmdrake.pm:450
+#: ../rpmdrake.pm:485
 #, c-format
 msgid "Error during download"
 msgstr ""
 
-#: ../rpmdrake.pm:452
+#: ../rpmdrake.pm:487
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -2075,93 +2086,93 @@ msgid ""
 "Please try again later."
 msgstr ""
 
-#: ../rpmdrake.pm:457
+#: ../rpmdrake.pm:492
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
 "%s\n"
-"The network, or the Mandrakesoft website, may be unavailable.\n"
+"The network, or the Mandriva website, may be unavailable.\n"
 "Please try again later."
 msgstr ""
 
-#: ../rpmdrake.pm:466
+#: ../rpmdrake.pm:501
 #, c-format
 msgid "No mirror"
 msgstr ""
 
-#: ../rpmdrake.pm:468
+#: ../rpmdrake.pm:503
 #, c-format
 msgid "I can't find any suitable mirror."
 msgstr ""
 
-#: ../rpmdrake.pm:469
+#: ../rpmdrake.pm:504
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
 "There can be many reasons for this problem; the most frequent is\n"
 "the case when the architecture of your processor is not supported\n"
-"by Mandrakelinux Official Updates."
+"by Mandriva Linux Official Updates."
 msgstr ""
 
-#: ../rpmdrake.pm:488
+#: ../rpmdrake.pm:523
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr ""
 
-#: ../rpmdrake.pm:547
+#: ../rpmdrake.pm:581
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:550
+#: ../rpmdrake.pm:584
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:553
+#: ../rpmdrake.pm:587
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:557
+#: ../rpmdrake.pm:591
 #, c-format
 msgid " done."
 msgstr ""
 
-#: ../rpmdrake.pm:561
+#: ../rpmdrake.pm:595
 #, c-format
 msgid " failed!"
 msgstr ""
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:565
+#: ../rpmdrake.pm:599
 #, c-format
 msgid "%s from medium %s"
 msgstr ""
 
-#: ../rpmdrake.pm:569
+#: ../rpmdrake.pm:603
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:573
+#: ../rpmdrake.pm:607
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:576
+#: ../rpmdrake.pm:610
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:613
+#: ../rpmdrake.pm:647
 #, c-format
 msgid "Error retrieving packages"
 msgstr ""
 
-#: ../rpmdrake.pm:614
+#: ../rpmdrake.pm:648
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2172,27 +2183,27 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:645
+#: ../rpmdrake.pm:679
 #, c-format
 msgid "Update media"
 msgstr ""
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:687
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr ""
 
-#: ../rpmdrake.pm:667
+#: ../rpmdrake.pm:701
 #, c-format
 msgid "Select all"
 msgstr ""
 
-#: ../rpmdrake.pm:671
+#: ../rpmdrake.pm:705
 #, c-format
 msgid "Update"
 msgstr ""
 
-#: ../rpmdrake.pm:693
+#: ../rpmdrake.pm:727
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2201,7 +2212,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:717 ../rpmdrake.pm:726
+#: ../rpmdrake.pm:751 ../rpmdrake.pm:760
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2209,17 +2220,17 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:738
+#: ../rpmdrake.pm:772
 #, c-format
 msgid "Unable to create medium."
 msgstr ""
 
-#: ../rpmdrake.pm:743
+#: ../rpmdrake.pm:777
 #, c-format
 msgid "Failure when adding medium"
 msgstr ""
 
-#: ../rpmdrake.pm:744
+#: ../rpmdrake.pm:778
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2227,7 +2238,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:757
+#: ../rpmdrake.pm:791
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
@@ -2235,20 +2246,20 @@ msgid ""
 "It will be disabled."
 msgstr ""
 
-#: ../rpmdrake.pm:760
+#: ../rpmdrake.pm:794
 #, c-format
 msgid ""
-"Your medium `%s', used for updates, does not match the version of "
-"Mandrakelinux you're running (%s).\n"
+"Your medium `%s', used for updates, does not match the version of Mandriva "
+"Linux you're running (%s).\n"
 "It will be disabled."
 msgstr ""
 
-#: ../rpmdrake.pm:776
+#: ../rpmdrake.pm:810
 #, c-format
 msgid "Help launched in background"
 msgstr ""
 
-#: ../rpmdrake.pm:777
+#: ../rpmdrake.pm:811
 #, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."