update

1 files changed, 101 insertions, 86 deletions

diff --git a/po/urpmi.pot b/po/urpmi.pot
index e6e46adf..6622f6cf 100644
--- a/po/urpmi.pot
+++ b/po/urpmi.pot
@@ -6,14 +6,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2008-04-22 20:19+0200\n"
+"POT-Creation-Date: 2008-06-02 09:53+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #: ../gurpmi:30 ../gurpmi2:72
 #, c-format
@@ -192,7 +191,7 @@ msgstr ""
 msgid "Warning"
 msgstr ""
 
-#: ../gurpmi2:126 ../urpmi:638
+#: ../gurpmi2:126 ../urpmi:629
 #, c-format
 msgid "Ok"
 msgstr ""
@@ -230,13 +229,13 @@ msgid ""
 "Continue installation anyway?"
 msgstr ""
 
-#: ../gurpmi2:232 ../urpmi:604
+#: ../gurpmi2:232 ../urpmi:595
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr ""
 
-#: ../gurpmi2:233 ../urpmi:605
+#: ../gurpmi2:233 ../urpmi:596
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -269,7 +268,7 @@ msgstr ""
 msgid "Installing package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../gurpmi2:278 ../urpmi:633
+#: ../gurpmi2:278 ../urpmi:624
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr ""
@@ -313,7 +312,7 @@ msgstr ""
 msgid "removing %s"
 msgstr ""
 
-#: ../gurpmi2:338 ../urpmi:692
+#: ../gurpmi2:338 ../urpmi:683
 #, c-format
 msgid "restarting urpmi"
 msgstr ""
@@ -391,7 +390,8 @@ msgid "...retrieving done"
 msgstr ""
 
 #: ../urpm.pm:258 ../urpm/download.pm:714 ../urpm/get_pkgs.pm:173
-#: ../urpm/media.pm:793 ../urpm/media.pm:1237 ../urpm/media.pm:1405
+#: ../urpm/media.pm:790 ../urpm/media.pm:1234 ../urpm/media.pm:1379
+#: ../urpm/media.pm:1433
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr ""
@@ -868,12 +868,17 @@ msgstr ""
 msgid "Installation is possible"
 msgstr ""
 
-#: ../urpm/md5sum.pm:20
+#: ../urpm/md5sum.pm:26
 #, c-format
 msgid "examining %s file"
 msgstr ""
 
-#: ../urpm/md5sum.pm:22
+#: ../urpm/md5sum.pm:27
+#, c-format
+msgid "invalid MD5SUM file"
+msgstr ""
+
+#: ../urpm/md5sum.pm:28
 #, c-format
 msgid "warning: md5sum for %s unavailable in MD5SUM file"
 msgstr ""
@@ -945,192 +950,197 @@ msgstr ""
 msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: ../urpm/media.pm:724
+#: ../urpm/media.pm:721
 #, c-format
 msgid "(ignored by default)"
 msgstr ""
 
-#: ../urpm/media.pm:730
+#: ../urpm/media.pm:727
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:736
+#: ../urpm/media.pm:733
 #, c-format
 msgid "adding medium \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:765
+#: ../urpm/media.pm:762
 #, c-format
 msgid "directory %s does not exist"
 msgstr ""
 
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:770
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr ""
 
-#: ../urpm/media.pm:791
+#: ../urpm/media.pm:788
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr ""
 
-#: ../urpm/media.pm:794
+#: ../urpm/media.pm:791
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr ""
 
-#: ../urpm/media.pm:812
+#: ../urpm/media.pm:809
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:861
+#: ../urpm/media.pm:858
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr ""
 
-#: ../urpm/media.pm:902
+#: ../urpm/media.pm:899
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:905
+#: ../urpm/media.pm:902
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr ""
 
-#: ../urpm/media.pm:925
+#: ../urpm/media.pm:922
 #, c-format
 msgid "removing medium \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:1001
+#: ../urpm/media.pm:1002
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:1039
+#: ../urpm/media.pm:1036
 #, c-format
 msgid "...reconfiguration failed"
 msgstr ""
 
-#: ../urpm/media.pm:1045
+#: ../urpm/media.pm:1042
 #, c-format
 msgid "reconfiguration done"
 msgstr ""
 
-#: ../urpm/media.pm:1061
+#: ../urpm/media.pm:1058
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr ""
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1079
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr ""
 
-#: ../urpm/media.pm:1093
+#: ../urpm/media.pm:1090
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr ""
 
-#: ../urpm/media.pm:1113
+#: ../urpm/media.pm:1110
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:1126 ../urpm/media.pm:1209
+#: ../urpm/media.pm:1123 ../urpm/media.pm:1206
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr ""
 
-#: ../urpm/media.pm:1128 ../urpm/media.pm:1183 ../urpm/media.pm:1421
+#: ../urpm/media.pm:1125 ../urpm/media.pm:1180 ../urpm/media.pm:1449
 #, c-format
 msgid "...copying failed"
 msgstr ""
 
-#: ../urpm/media.pm:1179
+#: ../urpm/media.pm:1176
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr ""
 
-#: ../urpm/media.pm:1181 ../urpm/media.pm:1213
+#: ../urpm/media.pm:1178 ../urpm/media.pm:1210
 #, c-format
 msgid "...copying done"
 msgstr ""
 
-#: ../urpm/media.pm:1215
+#: ../urpm/media.pm:1212
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
 
-#: ../urpm/media.pm:1248
+#: ../urpm/media.pm:1257
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr ""
 
-#: ../urpm/media.pm:1250 ../urpm/media.pm:1671
+#: ../urpm/media.pm:1259 ../urpm/media.pm:1699
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr ""
 
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1274
 #, c-format
 msgid "genhdlist2 failed on %s"
 msgstr ""
 
-#: ../urpm/media.pm:1275
+#: ../urpm/media.pm:1284
 #, c-format
 msgid "comparing %s and %s"
 msgstr ""
 
-#: ../urpm/media.pm:1300
+#: ../urpm/media.pm:1309
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:1326
+#: ../urpm/media.pm:1335
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr ""
 
-#: ../urpm/media.pm:1380
+#: ../urpm/media.pm:1377
+#, c-format
+msgid "invalid MD5SUM file (downloaded from %s)"
+msgstr ""
+
+#: ../urpm/media.pm:1408
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr ""
 
-#: ../urpm/media.pm:1397
+#: ../urpm/media.pm:1425
 #, c-format
 msgid "found probed synthesis as %s"
 msgstr ""
 
-#: ../urpm/media.pm:1404 ../urpm/media.pm:1512
+#: ../urpm/media.pm:1432 ../urpm/media.pm:1540
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:1455
+#: ../urpm/media.pm:1483
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr ""
 
-#: ../urpm/media.pm:1467
+#: ../urpm/media.pm:1495
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:1471
+#: ../urpm/media.pm:1499
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:1545
+#: ../urpm/media.pm:1573
 #, c-format
 msgid "updated medium \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:1665
+#: ../urpm/media.pm:1693
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1155,14 +1165,14 @@ msgstr ""
 msgid "getting mirror list from %s"
 msgstr ""
 
-#: ../urpm/msg.pm:63 ../urpmi:518 ../urpmi:534 ../urpmi:624
+#: ../urpm/msg.pm:63 ../urpmi:509 ../urpmi:525 ../urpmi:615
 #, c-format
 msgid "Nn"
 msgstr ""
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:37 ../urpmi:519 ../urpmi:535 ../urpmi:574
-#: ../urpmi:625 ../urpmi:661 ../urpmi:667 ../urpmi.addmedia:138
+#: ../urpm/msg.pm:64 ../urpme:37 ../urpmi:510 ../urpmi:526 ../urpmi:565
+#: ../urpmi:616 ../urpmi:652 ../urpmi:658 ../urpmi.addmedia:138
 #, c-format
 msgid "Yy"
 msgstr ""
@@ -1288,37 +1298,42 @@ msgstr ""
 msgid "The following packages contain %s: %s"
 msgstr ""
 
-#: ../urpm/select.pm:516 ../urpm/select.pm:559
+#: ../urpm/select.pm:298
+#, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr ""
+
+#: ../urpm/select.pm:534 ../urpm/select.pm:577
 #, c-format
 msgid "due to missing %s"
 msgstr ""
 
-#: ../urpm/select.pm:517
+#: ../urpm/select.pm:535
 #, c-format
 msgid "due to already installed %s"
 msgstr ""
 
-#: ../urpm/select.pm:518 ../urpm/select.pm:557
+#: ../urpm/select.pm:536 ../urpm/select.pm:575
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpm/select.pm:524
+#: ../urpm/select.pm:542
 #, c-format
 msgid "trying to promote %s"
 msgstr ""
 
-#: ../urpm/select.pm:525
+#: ../urpm/select.pm:543
 #, c-format
 msgid "in order to keep %s"
 msgstr ""
 
-#: ../urpm/select.pm:553
+#: ../urpm/select.pm:571
 #, c-format
 msgid "in order to install %s"
 msgstr ""
 
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:581
 #, c-format
 msgid "due to conflicts with %s"
 msgstr ""
@@ -1442,7 +1457,7 @@ msgstr ""
 msgid "unknown package"
 msgstr ""
 
-#: ../urpme:113 ../urpmi:548
+#: ../urpme:113 ../urpmi:539
 #, c-format
 msgid "removing package %s will break your system"
 msgstr ""
@@ -1472,7 +1487,7 @@ msgid_plural "Remove %d packages?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../urpme:128 ../urpmi:575 ../urpmi:662 ../urpmi.addmedia:141
+#: ../urpme:128 ../urpmi:566 ../urpmi:653 ../urpmi.addmedia:141
 #, c-format
 msgid " (y/N) "
 msgstr ""
@@ -2073,48 +2088,48 @@ msgid ""
 "Use --allow-force to force operation."
 msgstr ""
 
-#: ../urpmi:374
+#: ../urpmi:361
 #, c-format
 msgid "Updating media...\n"
 msgstr ""
 
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:453
+#: ../urpmi:448
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr ""
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:455
+#: ../urpmi:450
 #, c-format
 msgid "%s (to upgrade)"
 msgstr ""
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:459
+#: ../urpmi:454
 #, c-format
 msgid "%s: %s (to install)"
 msgstr ""
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:461
+#: ../urpmi:456
 #, c-format
 msgid "%s (to install)"
 msgstr ""
 
-#: ../urpmi:467
+#: ../urpmi:462
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr ""
 
-#: ../urpmi:470
+#: ../urpmi:465
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr ""
 
-#: ../urpmi:511
+#: ../urpmi:502
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2122,7 +2137,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../urpmi:513
+#: ../urpmi:504
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2130,33 +2145,33 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../urpmi:520 ../urpmi:536
+#: ../urpmi:511 ../urpmi:527
 #, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr ""
 
-#: ../urpmi:521 ../urpmi:537 ../urpmi:626 ../urpmi.addmedia:141
+#: ../urpmi:512 ../urpmi:528 ../urpmi:617 ../urpmi.addmedia:141
 #, c-format
 msgid " (Y/n) "
 msgstr ""
 
-#: ../urpmi:529
+#: ../urpmi:520
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: ../urpmi:530
+#: ../urpmi:521
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: ../urpmi:557
+#: ../urpmi:548
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2164,7 +2179,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../urpmi:559
+#: ../urpmi:550
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2172,26 +2187,26 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../urpmi:566
+#: ../urpmi:557
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
 "%s"
 msgstr ""
 
-#: ../urpmi:567
+#: ../urpmi:558
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
 msgstr ""
 
-#: ../urpmi:569
+#: ../urpmi:560
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:590
+#: ../urpmi:581
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2199,39 +2214,39 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../urpmi:607
+#: ../urpmi:598
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:613
+#: ../urpmi:604
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr ""
 
-#: ../urpmi:614
+#: ../urpmi:605
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr ""
 
-#: ../urpmi:615
+#: ../urpmi:606
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr ""
 
-#: ../urpmi:616
+#: ../urpmi:607
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../urpmi:638
+#: ../urpmi:629
 #, c-format
 msgid "Cancel"
 msgstr ""
 
-#: ../urpmi:646
+#: ../urpmi:637
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr ""