updated pot file

63 files changed, 26724 insertions, 27738 deletions

diff --git a/po/af.po b/po/af.po
index 74d47072..84f6615f 100644
--- a/po/af.po
+++ b/po/af.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: Fri May 19 2000 13:02:12+0200\n"
 "Last-Translator: Schalk W. Cronjé <schalkc@ntaba.co.za>\n"
 "Language-Team: Afrikaans <mandrake@af.org.za>\n"
@@ -48,22 +48,22 @@ msgid ""
 "You requested installation of package %s\n"
 msgstr ""
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "Is dit aanvaarbaar?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Kanselleer"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (J/n) "
@@ -73,382 +73,327 @@ msgstr " (J/n) "
 msgid "%s: command not found\n"
 msgstr ""
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "where [options] are from\n"
 msgstr ""
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - druk hierdie help boodskap.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr ""
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, c-format
 msgid "                    defaults is %s.\n"
 msgstr ""
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr ""
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr ""
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr ""
 
-#: ../urpm.pm:189
-#, fuzzy, c-format
-msgid "copy failed: %s"
-msgstr "Installasie het misluk"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr ""
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr ""
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr ""
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr ""
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr ""
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr ""
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr ""
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr ""
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr ""
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr ""
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, fuzzy, c-format
 msgid "syntax error in config file at line %s"
 msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
 "medium"
 msgstr ""
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr ""
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
 "ignored"
 msgstr ""
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr ""
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, fuzzy, c-format
 msgid "unable to write config file [%s]"
 msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr ""
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr ""
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr ""
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr ""
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr ""
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, fuzzy, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
 "update or --parallel"
 msgstr ""
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr ""
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr ""
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr ""
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, fuzzy, c-format
 msgid "skipping package %s"
 msgstr "geen pakket het die naam %s nie\n"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, fuzzy, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr ""
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr ""
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr ""
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr ""
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr ""
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, fuzzy, c-format
 msgid "...copying failed"
 msgstr "Installasie het misluk"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr ""
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
 "found)"
 msgstr ""
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr ""
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr ""
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr ""
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr ""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr ""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -456,372 +401,387 @@ msgid ""
 "medium."
 msgstr ""
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
 "ignored"
 msgstr ""
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr ""
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr ""
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr ""
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, fuzzy, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "Installasie het misluk"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr ""
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr ""
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr ""
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr ""
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr ""
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr ""
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, fuzzy, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, fuzzy, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, fuzzy, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, fuzzy, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr ""
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr ""
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, fuzzy, c-format
 msgid "mounting %s"
 msgstr "%s word installeer\n"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, fuzzy, c-format
 msgid "unmounting %s"
 msgstr "%s word installeer\n"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr ""
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr ""
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr ""
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr ""
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr ""
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, fuzzy, c-format
 msgid "no package named %s"
 msgstr "geen pakket het die naam %s nie\n"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, fuzzy, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Die volgende pakket bevat %s: %s\n"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, fuzzy, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
 "  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr ""
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr ""
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "RPM-databasisnavraag het misluk\n"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr ""
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, fuzzy, c-format
 msgid "unable to access medium \"%s\""
 msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr ""
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr ""
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr ""
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr ""
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, fuzzy, c-format
 msgid "removing package %s"
 msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, fuzzy, c-format
 msgid "unable to remove package %s"
 msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr ""
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, fuzzy, c-format
 msgid "unable to install package %s"
 msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "deur %s wat soek is"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "deur problematiese %s"
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr "probeer promosie van %s"
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, fuzzy, c-format
 msgid "in order to keep %s"
 msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, fuzzy, c-format
 msgid "in order to install %s"
 msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr ""
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr ""
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr ""
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr ""
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr ""
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr ""
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr ""
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Jammer, swak keuse, probeer weer\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -832,114 +792,104 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - druk hierdie help boodskap.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr ""
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - woordryke modus.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-
-#: ../urpme:91
+#: ../urpme:83
 #, fuzzy, c-format
 msgid "unknown packages"
 msgstr "geen pakket het die naam %s nie\n"
 
-#: ../urpme:91
+#: ../urpme:83
 #, fuzzy, c-format
 msgid "unknown package"
 msgstr "geen pakket het die naam %s nie\n"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr ""
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr ""
 
-#: ../urpme:107
+#: ../urpme:99
 #, fuzzy, c-format
 msgid "Checking to remove the following packages"
 msgstr "Slegs een van die volgende pakkette word benodig:"
 
-#: ../urpme:114
+#: ../urpme:106
 #, fuzzy, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
 "How afhanklikhede te bevredig, moet die volgende pakkette installeer word (%"
 "d MB)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, fuzzy, c-format
 msgid " (y/N) "
 msgstr " (J/n) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, fuzzy, c-format
 msgid "removing %s"
 msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr ""
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Jammer, swak keuse, probeer weer\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -950,38 +900,38 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr ""
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -989,148 +939,148 @@ msgid ""
 "                   line, incompatible with interactive mode).\n"
 msgstr ""
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr ""
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr ""
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr ""
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr ""
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr ""
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr ""
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr ""
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr ""
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr ""
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr ""
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr ""
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr ""
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr ""
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr ""
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr ""
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
 msgstr ""
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
 "%s\n"
 msgstr ""
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1141,32 +1091,32 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr ""
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that leads to remove.\n"
 msgstr ""
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1174,186 +1124,175 @@ msgid ""
 "                   default is %d.\n"
 msgstr ""
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr ""
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
 msgstr ""
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
 msgstr ""
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
 "                   X or text mode.\n"
 msgstr ""
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr ""
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr ""
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr ""
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1366,22 +1305,22 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "Moet niks doen nie"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr ""
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr ""
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1391,66 +1330,66 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, fuzzy, c-format
 msgid "Install it"
 msgstr "Installasie het misluk"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr ""
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr ""
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, fuzzy, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, fuzzy, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "Slegs een van die volgende pakkette word benodig:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Slegs een van die volgende pakkette word benodig:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Wat is u keuse (1-%d)"
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "Installasievoorbereiding..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "Aanvangstadium...."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr ""
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1458,60 +1397,70 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
 msgstr "Die volgende pakket bevat %s: %s\n"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
 "How afhanklikhede te bevredig, moet die volgende pakkette installeer word (%"
 "d MB)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
 "%s\n"
 msgstr ""
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Sit asb. die %s getiteld %s in"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, fuzzy, c-format
 msgid "Press Enter when ready..."
 msgstr "Druk ENTER wanneer u reg is..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, fuzzy, c-format
 msgid "Downloading package `%s'..."
 msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr ""
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr ""
+
+#: ../urpmi:606
 #, fuzzy, c-format
 msgid "The following packages have bad signatures"
 msgstr "Die volgende pakket bevat %s: %s\n"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr ""
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1519,57 +1468,57 @@ msgid ""
 "You may want to update your urpmi database"
 msgstr ""
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "Installasie het misluk"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, fuzzy, c-format
 msgid "distributing %s"
 msgstr "%s word installeer\n"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, fuzzy, c-format
 msgid "installing %s"
 msgstr "%s word installeer\n"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Installeer tans pakket %s (%s/%s)...."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Moet ons 'n installasie sonder afhanklikheidstoetsing probeer? (j/N) "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Moet ons die installasie afdwing (--force) ? (j/N) "
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "Installasie het misluk"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, fuzzy, c-format
 msgid "Installation is possible"
 msgstr "Installasie het misluk"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "Alles is alreeds installeer"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr ""
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1584,36 +1533,36 @@ msgid ""
 "and [options] are from\n"
 msgstr ""
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
 "                   hdlist file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1621,14 +1570,14 @@ msgid ""
 "                   anything else that has been configured ;-)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr ""
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1636,79 +1585,66 @@ msgid ""
 "                   installed mandrake-release package.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
 "                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr ""
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr ""
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr ""
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
+msgid "<relative path of hdlist> missing\n"
 msgstr ""
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
+msgid "`with' missing for network media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr ""
@@ -1725,6 +1661,13 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr ""
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1737,41 +1680,41 @@ msgid ""
 "(one of %s)\n"
 msgstr ""
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
 msgstr ""
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr ""
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr ""
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
 "(one of %s)\n"
 msgstr ""
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1782,123 +1725,124 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr ""
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr ""
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr ""
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr ""
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr ""
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr ""
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr ""
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr ""
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr ""
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: ../urpmq:160
+#: ../urpmq:147
 #, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgid "--list-nodes can only be used with --parallel"
 msgstr ""
 
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr ""
+#, fuzzy
+#~ msgid "copy failed: %s"
+#~ msgstr "Installasie het misluk"
 
-#: ../urpmq:216
-#, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr ""
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr ""
+#~ "How afhanklikhede te bevredig, moet die volgende pakkette installeer word "
+#~ "(%d MB)"
 
 #, fuzzy
 #~ msgid "Installation failed on node %s"
diff --git a/po/ar.po b/po/ar.po
index 9c340842..c8921541 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2004-03-08 13:24+0100\n"
 "Last-Translator: Youcef Rabah Rahal <rahal@arabeyes.org>\n"
 "Language-Team: Arabic <support@arabeyes.org>\n"
@@ -48,22 +49,22 @@ msgstr ""
 "التثبيت الآلي للحزم...\n"
 "لقد طلبت تثبيت الحزمة %s\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "هل أنت موافق؟"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "موافق"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "إلغاء"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (ن/ل)"
@@ -73,7 +74,7 @@ msgstr " (ن/ل)"
 msgid "%s: command not found\n"
 msgstr "%s: لم يتم يعثر على الأمر\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
@@ -82,113 +83,52 @@ msgstr ""
 "الاستعمال: %s [الخيارات]\n"
 "حيث [الخيارات] مأخوذة من\n"
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - تطبع رسالة المساعدة هذه.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "   -g [group]     - حدّد النّتائج إلى مجموعة معيّنة.\n"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, c-format
 msgid "                    defaults is %s.\n"
 msgstr "                    الافتراضات هي %s.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "أداة تنزيل غير معروفة `%s' !!!\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "بروتكول غير معرّف لـ%s"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "لم يعثر على أي وسيلة تنزيل، وسائل التنزيل المدعومة هي: %s\n"
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "تعذر التعامل مع البروتوكول: %s"
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "فشل نسخ: %s"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "wget غير موجود\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget فشل: تم الخروج بـ%d أو الإشارة %d\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "curl غير موجود\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "فشل curl: تم الخروج بـ %d أو الإشارة %d\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "rsync غير موجود\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "فشل rsync: تم الخروج بـ %d أو الإشارة %d\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "ssh غير موجود\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% من %s اكتمل، الوقت المتبقّي التقريبي = %s، بسرعة = %s"
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% اكتمل، بسرعة = %s"
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...فشل الإسترجاع: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "خطأ تركيبي في ملف التهيئة عند السطر %s"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr "الوسيط \"%s\" يحاول اسنخدام ملف hdlist مستخدم مسبقا، تم تجاهل الوسيط"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr "الوسيط \"%s\" يحاول استخدام قائمة مستخدمة مسبقا، تم تجاهل الوسيط"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -197,37 +137,37 @@ msgstr ""
 "لم يمكن الاعتناء بالوسيط \"%s\" حيث أن ملف القوائم قيد الاستخدام من قبل وسيط "
 "آخر"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr "لم يمكن استخدام الإسم \"%s\" لوسيط غير مسمى لأنه مستخدم بالفعل"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr "لم يمكن أخذ الوسيط \"%s\" في الحسبان لأنه لا يوجد ملف القوائم [%s]"
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "لم يمكن التعرف على الوسيط الخاص بملف hdlist هذا [%s]"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "لم يمكن الوصول الى ملف hdlist لـ\"%s\"، تم تجاهل الوسيط"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "لم يمكن الوصول الى ملف قائمة \"%s\"، تم تجاهل الوسيط"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "جاري محاولة تخطّي الوسيط الموجود \"%s\"، جري التجاهل"
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -236,92 +176,92 @@ msgstr ""
 "الوسيط الافتراضي \"%s\" يحاول اسنخدام ملف hdlist أو ملف قوائم مستخدم مسبقا، "
 "تم تجاهل الوسيط"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "الوسيط الافتراضي\"%s\" يجب أن يكون له عنوان واضح، تم تجاهل الوسيط"
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "لم يمكن ايجاد ملف hdlist لـ \"%s\"، تم تجاهل الوسيط"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "لم يمكن ايحاد ملف القوائم لـ\"%s\"، تم تجاهل الوسيط"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "ملف القوائم لـ\"%s\" متفكّك، تمّ تجاهل الوسيط"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "لم يمكن التفتيش عن ملف قائمة \"%s\"، تم تجاهل الوسيط"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "نقاط تجهيز كثيرة جدا للوسيط القابل للإزالة \"%s\""
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "جاري أخذ الأجهزة القابلة للإزالة كـ\"%s\""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "جاري استخدام الجهاز الآخر القابل للإزالة [%s] لـ\"%s\""
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "لم يمكن استرجاع اسم المسار للوسيط القابل للإزالة \"%s\""
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "غير قادر على كتابة ملف الإعدادات [%s]"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "اكتب ملف التهيئة [%s]"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "لا يمكن استخدام وضع التوازي parallel مع وضع استخدم-التوزيع"
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "تعذر تحليل \"%s\" في الملف [%s]"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "جاري اختبار المتعامل المتوازي في الملف [%s]"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "تم ايجاد المتعامل المتوازي للعقد: %s"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "جاري استخدام الوسائط المرتبطة للوضع المتوازي: %s"
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "تعذر استخدام الخيار المتوازي \"%s\""
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -330,90 +270,90 @@ msgstr ""
 "--synthesis لا يمكن استخدامه مع --media، --excludemedia، --sortmedia، --"
 "update أو --parallel"
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "جاري اختبار ملف التخليق [%s]"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "جاري اختبار ملف hdlist [%s]"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "الوسيط الافتراضي \"%s\" غير محلي، تم تجاهل الوسيط"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "مشكلة في قراءة ملف التخليق أو hdlist للوسيط \"%s\""
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "جاري القيام بالمرحلة الثانية لحساب المُعتمدات\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "جاري تخطي الحزمة %s"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "سيتم التثبيت بدلاً من ترقية الحزمة %s"
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "تعذر فتح rpmdb"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "الوسيط \"%s\" موجود مسبقا"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr "الوسيط الافتراضي يجب أن يكون محلياً"
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "تمت اضافة الوسيط %s"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "لم يمكن الوصول الى أول وسيط تخزين"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "جاري نسخ ملف hdlist..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "...فشل النسخ"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "...تم النسخ"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
@@ -421,43 +361,49 @@ msgid ""
 msgstr ""
 "لم يمكن الوصول الى وسيط التثبيت الأول (ملف Mandrake/base/hdlists غير موجود)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "جاري استرجاع ملف hdlists..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "...تم الاسترجاع"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...فشل الإسترجاع: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "وصف hdlist غير صالح \"%s\" في ملف hdlists"
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "جاري محاولة اختيار الوسيط غير موجود \"%s\""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "جاري اختيار الوسيط المتعدد: %s"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "جاري ازالة الوسيط \"%s\""
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -467,7 +413,7 @@ msgstr ""
 "لم يمكن الوصول للوسيط \"%s\"،\n"
 "قد يحدث هذا إن قيام بتجهيز الدليل يدويّاً عند إنشاء الوسيط."
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -476,223 +422,223 @@ msgstr ""
 "الوسيط الافتراضي \"%s\" يجب أن يكون مصدر تخليق أو hdlist صالح، تم تجاهل "
 "الوسيط"
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "جاري نسخ وصف الملف لـ\"%s\"..."
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "جاري حساب md5sum لـhdlist المصدر الموجود (أو التخليق)"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "جاري اختبار ملف MD5SUM"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "جاري نسخ hdlist (أو ملف تخليق) المصدر لـ\"%s\"..."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "فشل نسخ [%s] (الملفّ صغير بشكل مثيل للشّكّ)"
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "جاري حساب md5sum لـhdlist المصدر المنسوخ (أو التخليق)"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "فشل نسخ [%s] (md5sum غير متطابقة)"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "مشكلة في قراءة ملف التخليق للوسيط \"%s\""
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "جاري قراءة ملفات rpm من [%s]"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "تعذر قراءة ملفات rpm من [%s]: %s "
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "لم يُعثر على ملفات rpm من [%s]"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "جاري استرجاع hdlist (أو ملف تخليق) \"%s\"..."
 
 # y, c-format
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "تم ايجاد hdlist (أو ملف تخليق) كـ %s..."
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "جاري حساب md5sum لـhdlist المصدر المستحضر (أو التخليق)"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr "md5sum غير متطابق"
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "فشل استرجاع hdlist (أو ملف تخليق) المصدر"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "لم يمكن ايجاد ملف hdlist للوسيط \"%s\""
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "الملف [%s] مستخدم مسبقا في الوسيط نفسه \"%s\""
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "لم يمكن تحليل ملف hdlist لـ \"%s\""
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "غير قادر على كتابة ملف القوائم لـ \"%s\""
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "جاري كتابة ملف القوائم للوسيط \"%s\""
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "لا شئ تمت كتايته في ملف القوائم لـ \"%s\""
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "جاري اختبار ملف pubkey لـ\"%s\"..."
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...تم استيراد المفتاح %s من ملف pubkey \"%s\""
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "لم يمكن استيراد ملف pubkey الخاص بـ\"%s\""
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "جاري قراءة الترويسة من الوسيط \"%s\""
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "جاري بناء hdlist [%s]"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "تم بناء ملف تخليق hdlist للوسيط \"%s\""
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "عُثر على %d ترويسة في الذاكرة المخبّئة"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "تم إزالة %d الترويسات الملغيّة من الذاكرة المخبّئة"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "جاري تجهيز %s"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "جاري ازالة تجهيز %s"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "تم اعدة %s مدخل في depslist"
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "لم يتم اعادة مدخلات في depslist"
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "اسم ملف rpm غير موجود [%s]"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "جاري استرجاع ملف rpm [%s]..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "لم يمكن الوصول الى ملف rpm [%s]"
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "تعذر تسجيل ملف rpm"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "خطأ في تسجيل الحزم المحلية"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "لا توجد حزمة بالإسم %s"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "الحزم التالية تحتوي على %s: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "هناك حزم متعددة بنفس اسم ملف rpm \"%s\""
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "تعذر تحليل [%s] بشكل صحيح على القيمة \"%s\""
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -701,143 +647,158 @@ msgstr ""
 "الوسيط \"%s\" يستخدم ملف قوائم غير صالح   ربما تكون المرآة غير محدّثة، جاري "
 "محاولة استخدام طريقة بديلة"
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "الوسيط \"%s\" لا يعرف أي موقع لملفات rpm"
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "لم يمكن ايجاد الحزمة %s"
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "تم اقفال قاعدة بيانات urpmi"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "الوسيط \"%s\" غير مختار"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "لم يمكن قراءة ملف rpm [%s] من الوسيط \"%s\""
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "تم تحديد الوسيط المفكّك \"%s\" على أنه قابل للإزالة إلا أنه ليس كذلك"
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "لم يمكن الوصول الى الوسيط \"%s\""
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "ادخال مشوه: [%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "جاري استرجاع ملفات rpm للوسيط \"%s\"..."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "جاري التحضير..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "جاري استخدام العمليّة %d لتنفيذ المعاملة"
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr "جاري انشاء معاملة للتثبيت على %s (حذف=%d، تثبيت=%d، ترقية=%d)"
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr "تعذر انشاء المعاملة"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "جاري حذف الحزمة %s"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "تعذر حذف الحزمة %s"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "جاري اضافة الحزمة %s (id=%d، eid=%d، تحديث=%d، ملف=%s)"
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "تعذر تثبيث الحزمة %s"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "بسبب فقدان %s"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "بسبب عدم ارضاء %s"
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr "جاري محاولة ترقية %s"
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr "كي يتم الحفاظ على %s"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "كي يتم تثبيث %s"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "بسبب التعارض مع %s"
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr "غير مطلوب"
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "توقيع غير صالح (%s)"
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "مفتاح هوية غير صالح (%s)"
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "توقيع مفقود (%s)"
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "تعريف بروكسي خاطئ في سطر الأوامر\n"
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: لم يمكن ايجاد ملف rpm \"%s\"\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "المعذرة، اختيار سئ، حاول مرة أخرى\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -853,40 +814,40 @@ msgstr ""
 "\n"
 "الاستخدام:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - تطبع رسالة المساعدة هذه.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - قم باختيار حزمة آلياَ في الاختيارات.\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr "  --test         - تحقّق إن كان بالإمكان التثبيت بشكل صحيح.\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - أجبر التنفيذ حتى إن لم تكن بعض الحزم موجودة.\n"
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - urpmi موزّع على الأجهزة الخاصّة بالاسم البديل.\n"
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - استخدم جذر آخر لتثبيت حزم rpm.\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -895,73 +856,63 @@ msgstr ""
 "  --use-distrib  - هيّئ urpmi بشكل سريع من شجرة توزيع، مفيد\n"
 "                   لتثبيت/إزالة chroot باستخدام خيار --root.\n"
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - وضع تفصيلي.\n"
 
 #
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - اختر كل الحزم المتفقة مع المعامل.\n"
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: خيار غير معلوم \"-%s\"، تحقَّق من طريقة الإستخدام بـ --help\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr "حزم غير معروفة"
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "حزمة غير معروفة"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "إزالة الحزمة %s ستتسبب في تعطيل نظامك"
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr "لا شئ للإزالة"
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "جاري التحقق لإزالة الحزم التالية"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr "لإرضاء الاعتمادات، ستتم ازالة الحزم التالية (%d ميغابايت)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (ن/ل)"
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "جاري إزالة %s"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr "فشلت عملية الإزالة"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "المعذرة، اختيار سئ، حاول مرة أخرى\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -977,38 +928,38 @@ msgstr ""
 "\n"
 "الاستخدام:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - استخدم وسيط التحديث فقط.\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - استخدم فقط الوسيط المحدّد، مفصولة بفواصل.\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - لا تستخدم الوسيط المحدّد، مفصولة بفواصل.\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr "  --sortmedia    - افرز الوسيط بناءً على النصّ الفرعي مفصول بفواصل.\n"
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr "  --synthesis    - استخدم التخليق المحدّد بدلاً من قاعدة بيانات urpmi.\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - وضع التفصيل.\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1019,87 +970,87 @@ msgstr ""
 "سطر الأمر،\n"
 "                   وهذا غير متوافق مع الوضع التفاعلي).\n"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --uniq         - لا تطبع الأسماء المتشابهة.\n"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all           - اطبع كل الصّفات.\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group         - اطبع علامة المجموعة : المجموعة\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size          - اطبع حجم الصّفة : الصّفة.\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --epoch        - اطبع الصّفة epoch: epoch.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary      - اطبع تلخيص الصّفة : التلخيص.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description  - اطبع وصف الصّفة : الوصف.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr "  --sourcerpm    - اطبع الصّفة sourcerpm: الحزمة المصدريّة.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr "  --packager     - اطبع الصّفة المُغلّف : المغلّف.\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr "  --buildhost    - اطبع الصّفة جهاز التجميع : جهاز التجميع.\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --url          - اطبع الصّفة عنوان url: عنوان url.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr "  --provides     - اطبع الصّفة يُوفّر : كل ما يُوفّره.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr "  --requires     - اطبع الصّفة يتطلّب : كل ما يتطلّب.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files        - اطبع الصّفة ملفّات : كلّ الملفّات.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr "  --conflicts    - اطبع الصّفة يعارض : كل التعارضات.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr "  --obsoletes    - اطبع الصّفة الملغيّات : كل الملغيّات.\n"
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
@@ -1108,22 +1059,22 @@ msgstr ""
 "  --env          - استخدم بيئة محدّدة (عادة تقرير\n"
 "                   خطا).\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr "  -i             - تجاهل حالة الأحرف على كلّ الهيئات.\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - اطبع النّسخة، الإصدار وarch مع الاسم.\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - اشمل نصّ perl بشكل مباشر كـ perl -e.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
@@ -1131,7 +1082,7 @@ msgstr ""
 "  -a             - معامل AND الثّنائي، true إن كانت العبارتين الجبريّتين "
 "صحيحتين.\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
@@ -1139,24 +1090,24 @@ msgstr ""
 "  -o             - معامل OR الثّنائي، true إن كان أحد العبارتين الجبريّتين "
 "صحيح.\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - NOT أحاديّة، true إن كانت العبارة الجبريّة خاطئةً.\n"
 
 #
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr "  (              - قوس لجهة اليسار لفتح تعبير مجموعة.\n"
 
 #
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr "  (              - قوس لجهة اليمين لفتح تعبير مجموعة.\n"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
@@ -1165,12 +1116,12 @@ msgstr ""
 "الاتّصال المعاكس هو:\n"
 "%s\n"
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "جاري استخدام بيئة محددة على %s\n"
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1186,25 +1137,25 @@ msgstr ""
 "\n"
 "الاستخدام:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - استخدم التخليق التالي بدلاً من قاعدة بيانات urpmi.\n"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - اختر الحزم آليا لترقية النظام.\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr "  --no-uninstall - لا تسأل أبداً أن تزيل حزمةً، بل تجاهل التثبيت.\n"
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1213,7 +1164,7 @@ msgstr ""
 "  --keep         - أبْق الحزم الموجودة إن أمكن، وارفض الحزم المطلوبة\n"
 "                   التي تؤدّي للإزالة.\n"
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1224,37 +1175,37 @@ msgstr ""
 "المحدّة                   سوف يتمّ تثبيته أو تحديثه،\n"
 "                   والمفترض هو %d.\n"
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - small transaction length, default is %d.\n"
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - افرض البحث التقريبي (مثل -y).\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - الحزمة التالية هي حزمة مصدريّة (مثل -s).\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - ثبّت الحزمة المصدريّة فقط (لا المجمّعة).\n"
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - أزل حزمة rpm من الذاكرة المخبّئة قبل أي شيء آخر.\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - أبق حزم rpm الغير مستخدمة في الذاكرة المخبّئة.\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1263,7 +1214,7 @@ msgstr ""
 "  --allow-nodeps - اسمح بسؤال المستخدم عن تثبيت الحزم دون\n"
 "                   التّحقّق من المعتمدات.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1272,7 +1223,7 @@ msgstr ""
 "  --allow-force  - اسمح بسؤال المستخدم عن تثبيت الحزم دون\n"
 "                   التّحقّق من المعتمدات والتّكامل.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1281,22 +1232,22 @@ msgstr ""
 "  --use-distrib  - أعدّ urpmi بشكل سريع من شجرة توزيع، مفيد\n"
 "                   لتثبيت chroot باستخدام الخيار --root.\n"
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - استخدم wget لجلب الملفّات البعيدة.\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - استخدم curl لجلب الملفّات البعيدة.\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - حدّ من سرعة التنزيل.\n"
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1306,7 +1257,7 @@ msgstr ""
 "                   (يقوم الخيار --no-resume بتعطيله، والوضع الافتراضي هو "
 "معطّل).\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1315,7 +1266,7 @@ msgstr ""
 "  --proxy        - استخدم بروكسي HTTP المحدّد، رقم المنفذ الافتراضي\n"
 "                   هو 1080 (بتنسيق <proxyhost[:port]>).\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1325,7 +1276,7 @@ msgstr ""
 "البروكسي\n"
 "                   (بتنسيق <user:password>).\n"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1334,12 +1285,12 @@ msgstr ""
 "  --bug          - أخرج تقرير خطأ في الدّليل المحدّد.                    "
 "بالكلمة التالية.\n"
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - استخدم واجهة X.\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1348,7 +1299,7 @@ msgstr ""
 "  --best-output  - اختر الواجهة الأفضل بناءً على البيئة:\n"
 "                   وَضْع X أو النّصّي.\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1358,73 +1309,62 @@ msgstr ""
 "                   (--no-verify-rpm يعطّل هذا الخيار، وهو ممكّن بشكل "
 "افتراضي.)\n"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - استثن المسارات الفصولة بفاصلة.\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - استثْن ملفّات التوثيق.\n"
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - اختر كل التطابقات على سطر الأوامر.\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - السماح بالبحث في المعطيات ليجاد حزمة.\n"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - لا تبحث في المعطيات لإيجاد جزمة.\n"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - افرض البحث التّقريبيّ (مثل --fuzzy).\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s              - الحزمة التالية هي حزمة مصدرية (مثل --src).\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - وضع هادئ.\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  الأسماء أو ملفات rpm المعطاة على سطر الأوامر سيتم تثبيتها.\n"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr "اختر مكان حفظ الملف"
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "تعريف بروكسي خاطئ في سطر الأوامر\n"
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: خيار غير معلوم \"-%s\"، تحقَّق من طريقة الإستخدام بـ --help\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr "ماذا يمكن فعله مع ملف rpm تنفيذي عند استخدام المعامل --install-src"
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1445,22 +1385,22 @@ msgstr ""
 "\n"
 "ماذا تودّ أن تفعل؟"
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "لا تفعل شيئاً"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr "نعم، قم بتثبيتها"
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr "احفظ الملف"
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1475,54 +1415,54 @@ msgstr ""
 "\n"
 "قد ترغب بحفظها فقط. ما هو اختيارك؟"
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, c-format
 msgid "Install it"
 msgstr "قم بتثبيتها"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr "الدّليل [%s] موجود مسبقاً، رجاء استخدم دليلاً آخر لتقرير المشكلة أو حذفها"
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "تعذر انشاء الدليل [%s] لتقرير العيوب"
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "المستخدم الجذر فقط مسموح له بتثبيت الحزم"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "واحد من هذه الحدم يُحتاج اليه لتثبيت %s:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "أحد الحزم التالية يُحتاج اليه:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "ما هو اختيارك؟ (1-%d)"
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "تثبيت الحزم..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "جاري البدء..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1531,12 +1471,12 @@ msgstr ""
 "لا يمكن تثبيت بعض الحزم المطلوبة:\n"
 "%s"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr "هل أنت موافق ؟"
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1547,7 +1487,7 @@ msgstr ""
 "لكي تتم ترقية الحزم الأخرى:\n"
 "%s\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1556,14 +1496,14 @@ msgstr ""
 "يجب حذف الحزم التالية لترقية الحزم الأخرى:\n"
 "%s"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr "لإرضاء الاعتمادات، سيتم تثبيت الحزم التالية )%d ميغابايت("
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1572,37 +1512,47 @@ msgstr ""
 "يجب أن تكون مستخدم جذر لكي تقوم بتثبيت الإعتمادات التالية:\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "لم يمكن الحصول على الحزمة المصدرية، جاري الإنهاء"
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "يرجى ادخال الوسيط \"%s\" في الجهاز [%s]"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "اضغط Enter عند الاستعداد..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "جاري تنزيل الحزمة `%s'..."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% من %s اكتمل، الوقت المتبقّي التقريبي = %s، بسرعة = %s"
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% اكتمل، بسرعة = %s"
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "الحزم التالية تحتوي على توقيعات فاسدة"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "هل تريد متابعة التثبيت؟"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1613,57 +1563,57 @@ msgstr ""
 "%s\n"
 "ربما تريد تحديث فاعدة بيانات urpmi الخاصة بك"
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "فشل التثبيت"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr "جاري توزيع %s"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr "جاري تثبيت %s"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "جاري تثبيت الحزمة `%s' (%s/%s)..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "محاولة التثبيت دون التأكد من الاعتمادات؟ (y[نعم]/N[لا])"
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "حاول التثبيت بشكل أقوى (--force)؟ (y[نعم]/N[لا])."
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "فشل معاملات تثبيت %d"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "التثبيت ممكن"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "كل شئ مثبت مسبقا"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr "تجري إعادة تشغيل urpmi"
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1688,22 +1638,22 @@ msgstr ""
 "\n"
 "و [options] هم من\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - اعمل وسيط تحديث.\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr "  --probe-synthesis - حاول أو تجد وتستخدم ملفّ التخليق.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr "  --probe-hdlist - حاول أن تجد وتستخدم ملف hdlist.\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
@@ -1712,7 +1662,7 @@ msgstr ""
 "  --no-probe     - لا تحاول أن تعثر على أي ملفّ تخليق\n"
 "                   أو ملف hdlist.\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -1721,7 +1671,7 @@ msgstr ""
 "  --distrib      - أنشئ كلّ الوسطاء تلقائيّاً من\n"
 "                   وسيط التّثبيت\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1733,7 +1683,7 @@ msgstr ""
 "، تحديثات (updates) أو\n"
 "                   أيّ شيئ آخر قد تمّ إعداده ؛-)\n"
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1742,7 +1692,7 @@ msgstr ""
 "  --from         - استخدم عنوان url المحدّد للائحة المرايا، والافتراضيّة هي\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1753,7 +1703,7 @@ msgstr ""
 "                   من نسخة التوزيعة التي تُخبِر بها\n"
 "                   حزمة إصدار ماندريك المثبّتة.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
@@ -1762,7 +1712,7 @@ msgstr ""
 "  --arch         - إستعمل البنية المحدّدة، الافتراض هو بنية\n"
 "                   حزمة إصدارة ماندريك (mandrake-release) المثبّتة.\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
@@ -1771,73 +1721,52 @@ msgstr ""
 "   --virtual      - أنشئ وسائط خيالية محدّثة بصفة دائمة،\n"
 "                   يسمح ببروتوكول file:// فقط.\n"
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - عطّل التحقّق من MD5SUM للملفّات.\n"
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - نظّف دليل ذاكرة الترويسات المخبّئة.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - أجبر توليد ملفات hdlist.\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"خيارات غير معروفة '%s'\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "تعذر اضافة التحديثات لتوزيعة ccoker\n"
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "جاري استرجاع المرايا عند %s ..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"لا داعي لإعطاء <المسار المُرتبط لـhdlist> مع --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "لا داعي لإعطاء <المسار المُرتبط لـhdlist> مع --distrib"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "لم يمكن تحديث الوسيط \"%s\"\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"<relative path of hdlist> غير موجود\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<relative path of hdlist> غير موجود\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"`with' غير موجود لوسائط الشبكة\n"
+msgid "`with' missing for network media\n"
+msgstr "`with' غير موجود لوسائط الشبكة\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "لم يمكن عمل الوسيط \"%s\"\n"
@@ -1856,6 +1785,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - استخدم كل الوسائط.\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"خيارات غير معروفة '%s'\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1870,7 +1808,7 @@ msgstr ""
 "المدخل المطلوب ازالته غير موجود\n"
 "(واحد من %s)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1879,27 +1817,27 @@ msgstr ""
 "الاستخدام: urpmi.update [options] <name> ...\n"
 "حيث أن <name> هو اسم الوسيط المطلوب تحديثه.\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - حدّث فقط وسائط التّحديث.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr "  --force-key    - أجبر تحديث مفتاح gpg.\n"
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - اختر كلّ الوسائط الغير قابلة للإزالة.\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "لا شئ للتحديث (استخدم urpmi.addmedia لإضافة وسيط)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1908,7 +1846,7 @@ msgstr ""
 "المدخل المطلوب تحديثه غير موجود\n"
 "(واحد من %s)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1924,38 +1862,38 @@ msgstr ""
 "\n"
 "الاستخدام:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - اسرد الحزم المتوفّرة.\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - اسرد الوسائط المتوفّرة.\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - اسرد الوسائط المتوفّرة وعناوينها.\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr "   --dump-config  - أكتب الإعداد على شكل متغيّر لـ urpmi.addmedia.\n"
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr "  --list-nodes   - اسرد النقاط المتوفّرة عند استخدام --parallel.\n"
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - إصنع قائمة للأسماء المستعارة الموازية.\n"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
@@ -1965,14 +1903,14 @@ msgstr ""
 "إلى\n"
 "                   stdout (المستخدم root فقط).\n"
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 "  --sources      - أعط كل الحزم المصدريّة قبل تنزيلها (المستخدم root فقط).\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
@@ -1981,74 +1919,126 @@ msgstr ""
 "  --use-distrib  - أعدّ urpmi بشكل سريع من شجرة التوزيعة.\n"
 "                   يسمح هذا بالاستعلام من توزيعة.\n"
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - اطبع سجلّ التغيير.\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - وسّع الاستعلام ليشتمل المعتمدات.\n"
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr "  -u             - أزل الحزمة إن كان هناك إصدارة أحدث منها مثبّتة.\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - مخرجات تامّة مع الحزمة الواجب حذفها.\n"
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - اعكس البحث لما يتطلّب هذه الحزمة.\n"
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -i             - اطبع معلومات مفيدة بشكل مقروء للإنسان.\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - تطبع المجموعات أيضا مع الأسماء أيضاً.\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - تطبع الإصدار و رقمه أيضا مع الإسم أيضاً.\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - اسرد الملفّات في الحزمة.\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  الأسماء أو ملفات rpm المعطاة على سطر الأوامر يتم الاستعلام عنها.\n"
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-"urpmq: خيار غير معروف \"-%s\"، تحقق من طريقة الاستخدام بالخيار --help\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: لم يمكن ايجاد ملف rpm \"%s\"\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes يمكن استخدامه فقط مع --parallel"
 
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "أداة تنزيل غير معروفة `%s' !!!\n"
+
+#~ msgid "copy failed: %s"
+#~ msgstr "فشل نسخ: %s"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "wget غير موجود\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "wget فشل: تم الخروج بـ%d أو الإشارة %d\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "curl غير موجود\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "فشل curl: تم الخروج بـ %d أو الإشارة %d\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "rsync غير موجود\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "فشل rsync: تم الخروج بـ %d أو الإشارة %d\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "ssh غير موجود\n"
+
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpme: خيار غير معلوم \"-%s\"، تحقَّق من طريقة الإستخدام بـ --help\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmi: خيار غير معلوم \"-%s\"، تحقَّق من طريقة الإستخدام بـ --help\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr "لإرضاء الاعتمادات، سيتم تثبيت الحزم التالية )%d ميغابايت("
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "لا داعي لإعطاء <المسار المُرتبط لـhdlist> مع --distrib"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "<relative path of hdlist> غير موجود\n"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "`with' غير موجود لوسائط الشبكة\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpmq: خيار غير معروف \"-%s\"، تحقق من طريقة الاستخدام بالخيار --help\n"
+
 #~ msgid "no webfetch (curl or wget currently) found\n"
 #~ msgstr "لم يمكن ايجاد وسيلة لتنزيل الملفات (curl أو wget حاليا)\n"
 
diff --git a/po/az.po b/po/az.po
index c0440f07..7a88eacf 100644
--- a/po/az.po
+++ b/po/az.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-az\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2004-02-19 12:56+0200\n"
 "Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
 "Language-Team: Azerbaijani Turkish <gnome@azitt.com>\n"
@@ -51,22 +51,22 @@ msgstr ""
 "Paketlərin öz özünə qurulması...\n"
 "%s paketlərininin qurulmasını istədiniz\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "Oldu mu?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "Oldu"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Ləğv et"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (B/x) "
@@ -76,124 +76,63 @@ msgstr " (B/x) "
 msgid "%s: command not found\n"
 msgstr "%s: əmr tapılmadı\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "where [options] are from\n"
 msgstr ""
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - bu kömək ismarışını çap edər.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, fuzzy, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "  --group         - taq qrupunu göstər: qrup.\n"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, fuzzy, c-format
 msgid "                    defaults is %s.\n"
 msgstr "  -l             - paketdəki faylları göstər.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Namə'lum webfetch `%s' !!!\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "%s üçün müəyyən edilən protokol namə'lumdur"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "webfetch tapılmadı, dəstəklənən webfetch-lər: %s\n"
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "protokol istifadə edilə bilmir: %s"
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "köçürtmə bacarılmadı: %s"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "wget mövcud deyil\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget bacarılmadı: %d ya da %d siqnalı ilə çıxdı\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "curl mövcud deyil\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl bacarılmadı: %d ya da %d siqnalı ilə çıxdı\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "rsync əksikdir\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "rsync bacarılmadı: %d ya da %d siqnalı ilə çıxdı\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "ssh mövcud deyil\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% of %s bitdi, QV = %s, sür'ət = %s"
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% bitdi, sür'ət = %s"
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...alış bacarılmadı: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "quraşdırma faylında %s sətirində sintaksis xətası"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 "\"%s\" medyumu istifadədə olan hdlist'i işlətməyə cəhd etdi, medya rədd "
 "edildi"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 "\"%s\" medyumu onsuz da istifadədə olan siyahını işlətməyə cəhd etdi, medyum "
 "rədd edildi"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -202,38 +141,38 @@ msgstr ""
 "\"%s\" medyası siyahı faylı başqa medya tərəfindən istifadədə olduğu üçün "
 "diqqətə alına bilir"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 "adsız medya üçün \"%s\" adı işlədilə bilmir, çünkü onsuz da istifadədədir"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr "\"%s\" medyası [%s] siyahı faylına malik olmadığı üçün alına bilmir"
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "bu [%s] hdlist faylı medyası tapıla bilmədi"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "\"%s\" medyası hdlist faylına çatıla bilmir, medya rədd edildi"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "\"%s\" siyahı faylına çatıla bilmədi, medya rədd edildi"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "mövcud medya \"%s\" yan keçilməyə çalışıldı, imtina edirəm"
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -242,92 +181,92 @@ msgstr ""
 "\"%s\" medyasının hdlist ya da siyahı faylı tə'yin edilməməlidir, medya rədd "
 "edildi"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "\"%s\" virtual medyumunun düzgün url'si olmalıdır, mediyum rədd edildi"
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "\"%s\" üçün hdlist faylı tapıla bilmir, medya rədd edildi"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "\"%s\" üçün siyahı faylı tapıla bilmir, medya rədd edilir"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "\"%s\" üçün inkoherent siyahı faylı, medya rədd edildi"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "\"%s\" faylları siyahısı yoxlana bilmir, medya rədd edildi"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "\"%s\" çıxardıla bilən mediyası üçün həddindən çox bağlama nöqtəsi"
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "çıxardıla bilən avadanlıq \"%s\" olaraq alınır"
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "\"%1$s\" üçün fərqli çıxardıla bilən avadanlıq [%2$s] işlət"
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "\"%s\" çıxardıla bilən mediyumu üçün cığır adı alına bilmədi"
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "[%s] quraşdırma faylı yazıla bilmir"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "[%s] quraşdırma faylı yazılır"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "use-distrib modu ilə bərabər paralel mod işlədilə bilməz"
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "[%s] faylındakı \"%s\" oxuna bilmədi"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "[%s] faylındakı paralel tutucu yoxlanır"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "düyümlər üçün paralel tutucu tapıldı: %s"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "paralel mod üçün əlaqələndirilmiş mediya işlədilir: %s"
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr " \"%s\" paralel seçənəyi işlədilə bilmədi"
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -336,90 +275,90 @@ msgstr ""
 "--synthesis bunlarla bərabər istifadə edilə bilməz: --media, --excludemedia, "
 "--sortmedia, --update ya da --parallel"
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "[%s] synthesis faylı sınanır "
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "[%s] hdlist faylı yoxlanır"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "\"%s\" vertual medyumu  yerli deyil, medyum rədd edildi"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "\"%s\" medyasının hdlist ya da synthesis faylı oxuna bilmədi"
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "asıllılıqlar hesablanmaq üçün ikinci dəfə sınanır\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "%s paketi keçilir"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "%s yeniləmə paketi yerinə qurula bilər"
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "rpmb açıla bilmir"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "\"%s\" medyası onsuz da vardır"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr "virtual mediyum yerli olmalıdır"
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "%s medyası əlavə edildi"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "Birinci qurulum medyumuna yetişilə bilmir"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "hdlist faylı köçürdülür..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "...köçütrmə bacarılmadı"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "...köçürtmə bitdi"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
@@ -428,43 +367,49 @@ msgstr ""
 "birinci qurulum mediyasına yetişə bilmədim (Mandrake/base/hdlists faylı "
 "tapıla bilmədi)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "hdlists faylı alınır..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "...alınma bitdi"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...alış bacarılmadı: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "hdlists faylında hökmsüz \"%s\" hdlist izahatı"
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "mövcud olmayan \"%s\" medyumu seçilməyə çalışılır"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "birdən çox medya seçilir: %s"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "\"%s\" medyumu çıxardılır"
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -474,7 +419,7 @@ msgstr ""
 "\"%s\" mediyumuna yetişə bilmədim,\n"
 "bu, mediyum yaradarkən cərgəni əl ilə bağlayanda baş göstərə bilər."
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -483,223 +428,223 @@ msgstr ""
 "\"%s\" virtual medyumunun hökmlü mənbə hdlist'i ya da synthesis'i olmalıdır, "
 "medya rədd edildi"
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "\"%s\" faylının izahat faylı köçürdülür..."
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "mövcud mənbə hdlist (ya da synthesis) faylının md5sum'ları hesablanır"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "MD5SUM faylı sınanır"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "\"%s\"in mənbə hdlist (ya da synthesis) faylı köçürdülür..."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "[%s] faylının köçürülməsi bacarılmadı (fayl şüphəli dərəcədə kiçikdir)"
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr ""
 "köçürdülmüş mənbə hdlist (ya da synthesis) faylının md5sum'ları hesablanır"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "[%s] köçürülmə əməliyyatı bacarılmadı (md5sum uyğunsuzluğu)"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "\"%s\" medyasının synthesis faylı oxuna bilmədi"
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "rpm faylları [%s] üstündən oxunur"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "[%s]'dan rpm faylı oxuna bilmir: %s"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "[%s] üstündə rpm fayı tapıla bilmədi"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "\"%s\"in mənbə hdlist (ya da synthesis) faylı alınır..."
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "%s adında sınanmış hdlist (ya da synthesis) tapıldı"
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "alınan mənbə hdlist (ya da synthesis) faylının md5sum'ları hesablanır"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr "md5sum uyğunsuzluğu"
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "mənbə hdlist (ya da synthesis) faylının alınması bacarılmadı"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "\"%s\" medyası hdlist faylı tapılmadı"
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "[%s] faylı onsuzda eyni \"%s\" mediyumda işlədilib"
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "\"%s\" hdlist faylı alına bilmir"
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "\"%s\" fayl siyahısı yazıla bilmi"
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "\"%s\" medyası üçün siyahı faylı yazılır"
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "\"%s\" üçün siyahı faylında bir şey yazılmır"
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "\"%s\" faylının pubkey'si yoxlanır..."
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...\"%s\"nın pubkey faylından %s açarı idxal edildi"
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "\"%s\"  faylının pubkey'si idxal edilə bilmədi"
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "\"%s\" medyasından üst mə'lumatlar oxunur"
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "[%s] hdlist faylı inşa edilir"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "\"%s\" medyası hdlist sintezi inşa edilid"
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "ön yaddaşda %d başlıq tapıldı"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "ön yaddaşdakı %d mütləq başlıqlar çıxardılır"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "%s bağlanır"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "%s ayrılır"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "asılılıqlar siyahısında %s sahə yenidən yerləşdirildi"
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "depslist siyahısındakı heç bir giriş yerini dəyişdirməyib"
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "hökmsüz rpm fayı adı [%s]"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "[%s] rpm faylı alınır ..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "rpm faylı [%s] çatıla bilmir"
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "rpm faylı qeydiyyatdan keçirilə bilmədi"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "yerli paket qeydiyyat xətası"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "%s adlı paket yoxdur"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Aşağıdakı paketlər %s daxıl edir: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "\"%s\" rpm fayl adlı birdən çox fayl tapıldı"
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "\"%s\" qiymətindəki [%s] düzgün oxuna bilmədi"
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -708,143 +653,158 @@ msgstr ""
 "\"%s\" mediyumu hökmsüz siyahı  faylı işlədir:\n"
 "  yəqin ki əks yenilənməyib, alternativ yöntəmi işlətməyə çalışıram"
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "\"%s\" mediyumu hər hansı bir rpm faylının mövqeyini bildirmir"
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "%s paketi tapılmadı."
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi databeyzi qıfıllıdır"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "\"%s\" medyası seçili deyil"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "\"%s\" medyasından [%s] rpm faylı oxuna bilmir"
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "\"%s\" inkeherent medyası söküləbilən deyə bildirilib, amma deyil"
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "\"%s\" medyasına çatıla bilmir"
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "xətalı giriş: [%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "\"%s\" mediyumundan rpm faylları alınır..."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "Hazırlanır..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "keçiş icrası üçün %d gedişatı istifadə edilir"
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr "%s üstündə qurma üçün keçiş bitdi (sil=%d, qul=%d, yenilə=%d)"
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr "keçiş yaradıla bilmir"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "%s peketi silinir"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "%s paketi çıxardıla bilmədi"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "%s paketi əlavə edilir (id=%d, eid=%d, yeniləmə=%d, fayl=%s)"
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "%s paketi qurula bilmədi"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "%s əksik olduğuna görə"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "razı qalmayan %s olduğuna görə"
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr "%s irəliləndirməyə çalışılır"
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr "%s'ı saxlamaq üçün"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "%s paket(lər)ini qurmaq üçün"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "%s ilə yaranan toqquşma səbəbiylə"
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr "tələb edilməmiş"
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Hökmsüz imza (%s)"
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "Hökmsüz Qiymət ID (%s)"
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Əksik imza (%s)"
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "əmr sətirində hökmsüz vəkil tə'yini\n"
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: \"%s\" rpm faylı oxuna bilmir\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Xətalı seçənək, təkrar sınayın\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -861,114 +821,103 @@ msgstr ""
 "\n"
 "istifadə qaydası:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - bu kömək ismarışını çap edər.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - seçililər arasında paketi avtomatik seç.\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr "  --test         - qurulumun düzgün edilə biləcəyini yoxla.\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - bəzi paketlər mövcud olmasa belə istəməyə zorla.\n"
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - alias sistemləri arasında paylaşılmış urpmi.\n"
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - rpm qurulumu üçün başqa root işlət.\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to (un)install a chroot with --root option.\n"
 msgstr "  --use-distrib  - urpmi-ni birbaşa distrib ağacından quraşdır.\n"
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - təfsilatlı mod.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - qaydaya uyğun gələn bütün paketləri seç.\n"
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-"urpme: namə'lum seçənək \"-%s\", istifadə qaydasını --help ilə yoxlayın\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr "namə'lum paketlər"
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "na'məlum paket "
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "%s paketini silmək sisteminizi pozacaq"
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr "Silinəcək heç bir şey yoxdur"
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "Aşağıdakı paketlər silinmək üçün yoxlanır"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
 "Asılıqları ortadan qaldırmaq üçün, aşağıdakı paketlər silinəcəkdir (%d MB)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (b/X) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "%s silinir"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr "Çıxartma bacarılmadı"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Xətalı seçənək, təkrar sınayın\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -985,40 +934,40 @@ msgstr ""
 "\n"
 "istifadə qaydası:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - təkcə güncəl medyanı işlət.\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 "  --media       - ancaq vergüllə ayrılmış verilən mediya(lar)nı işlət.\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - vergüllə ayrılmış verilən mediya(lar)nı işlətmə.\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 "  --sortmedia    - vergüllə ayrılmış alt qatarlara görə mediyanı sırala.\n"
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr "  --synthesis    - urpmi db yerinə verilən synthesis'i işlət.\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - təfsilatlı mod.\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1026,87 +975,87 @@ msgid ""
 "                   line, incompatible with interactive mode).\n"
 msgstr "  --quiet        - taq adlarını göstərmə.\n"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --uniq         - identik sətirləri göstərmə.\n"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all           - bütün təqləri göstər.\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group         - taq qrupunu göstər: qrup.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size          - taq böyüklüyünü göstər: böyüklük.\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --epoch        - taq epoch'unu göstər: epoch.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary       - taq icmalını göstər: icmal.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description   - taq izahatını göstər: izahat.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr "  --sourcerpm    - taq sourcerpm'ini göstər: source rpm.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr "  --packager     - taq paketləyicisini göstərr: paketləyici.\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr "  --buildhost    - taq inşa qovşağını göstər: inşa qovşağı.\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --url          - taq url'sini göstər: url.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr "  --provides      - taq gətirənini göstər: bütün gətirənlər.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr "  --requires      - taq lazımlılarını göstər: bütün lazımlılar.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files         - taq fayllarını göstər: bütün fayllar.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr "  --conflicts     - taq toqquşmalarını göstər: bütün toqquşmalar.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr "  --obsoletes     - taq mütləqlərini göstər: bütün mütləqlər.\n"
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
@@ -1115,24 +1064,24 @@ msgstr ""
 "  --env          - xüsusi mühit işlət (əsasən bir xəta\n"
 "                   raportu).\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
 "  -i             - hər patterndə bötük/kiçik hərf qaydalarını rədd et.\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - adla birlikdə buraxılış, yayını və arch'ı da çap et.\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - perl kodunu birbaşa perl -e kimi daxil et.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
@@ -1140,7 +1089,7 @@ msgstr ""
 "  -a             - binary AND operatoru, ifadələrin ikisi də doğru isə "
 "nəticə də doğrudur.\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
@@ -1148,23 +1097,23 @@ msgstr ""
 "  -o             - OR operatoru, ifadələrdən biri doğrudursa nəticə doğru "
 "olacaq.\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 "  !              - NOT operatoru, ifadə səhv isə nəticə doğru olacaq.\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr "  (              - sol mötərizə qrup ifadəsini açmaq üçün.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr "  )              - sağ mötərizə qrup ifadəsini bağlamaq üçün.\n"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
@@ -1173,12 +1122,12 @@ msgstr ""
 "geri çağırış :\n"
 "%s\n"
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "%s üstündə xüsusi mühit istifadə edilir\n"
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1195,25 +1144,25 @@ msgstr ""
 "\n"
 "istifadə şəkli:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - urpmi db yerinə verilən synthesis'i işlət.\n"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - sistemi yeniləmək üçün paketləri avtomatik seç.\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr "  --no-uninstall - paket silməyi qətiyyən soruşma, qurulumu bitir.\n"
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1223,7 +1172,7 @@ msgstr ""
 "paketlərin\n"
 "                   silinməsini məcbur qılan paketləri rədd et.\n"
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1234,37 +1183,37 @@ msgstr ""
 "                   daha qısa keçişlərə böl,\n"
 "                   əsas qiymət: %d.\n"
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - kiçik keçiş uzunluqu, əsasən %d.\n"
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - fuzzy axtarmanı qəbul et ( -y ilə eyni).\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  -src           - növbəti paket mənbə paketidir (--s ilə eyni).\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - ancaq mənbə paketini qur (ikililəri yox).\n"
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - hərşeydən əvvəl ara yaddaşdan rpm'i sil.\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - rpm'ləri ara yaddaşda işlətmə.\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1273,7 +1222,7 @@ msgstr ""
 "  --allow-nodeps - istifadəçiyə paketi asıllılıqları diqqətə almadan\n"
 "                   qurma sualı verməyə icazə ver.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1282,29 +1231,29 @@ msgstr ""
 "  --allow-force - istifadəçiyə paketi asıllılıqları və uyğunluq\n"
 "                   yoxlanmadan qurma sualı verməyə icazə ver.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 msgstr "  --use-distrib  - urpmi-ni birbaşa distrib ağacından quraşdır.\n"
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - wget'i uzaqdakı faylları almaq üçün işlədin.\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - uzaqdakı faylları almaq üçün curl işlət.\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - endirmə sür'ətinə sərhəd qoy .\n"
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1314,7 +1263,7 @@ msgstr ""
 "                   (--no-resume bunu qeyri-fəallaşdırır, əsasən qeyri-"
 "fəaldır).\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1325,7 +1274,7 @@ msgstr ""
 "                   1080 qəbul edilir (istifadə qaydası: <vəkilqovşaq[:qapı]"
 ">).\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1335,7 +1284,7 @@ msgstr ""
 "                   istifadəçi adı və şifrə (istifadə qaydası: <istifadəçi:"
 "şifrə>).\n"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1344,12 +1293,12 @@ msgstr ""
 "  --bug          - bir sonrakı verilən arqumentlə verilmiş cərgəyə\n"
 "                   xəta raportunu yaz.\n"
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - X ara üzünü işlət.\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1358,7 +1307,7 @@ msgstr ""
 "  --best-output  - mühitə görə ən yaxşı olan ara üzü seç:\n"
 "                   X ya da mətn modu.\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1368,76 +1317,64 @@ msgstr ""
 "                   (--no-verify-rpm bunu qeyri-fəallaşdırır, əsasən "
 "fəaldır).\n"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - vergüllə ayrılmış daxil etməmə çığırı.\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - sənəd fayllarını ixrac et.\n"
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - əmr sətirindəki bütün uyğun gələnləri seç.\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 "  -p             - paketi tapmaq üçün verilənlər arasında axtarmaya icazə "
 "ver.\n"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - paketi tapmaq üçün verilənlər arasında axtarma.\n"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - fuzzy axtarmanı qəbul et ( --fuzzy ilə eyni).\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s             - növbəti paket mənbə paketidir (--src ilə eyni).\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - səssiz mod.\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  əmr sətirində verilən adlar ya da rpm faylları qurulacaq.\n"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr "Qeyd ediləcək ünvanı seçin"
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "əmr sətirində hökmsüz vəkil tə'yini\n"
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-"urpmq: namə'lum seçənək \"-%s\", istifadə qaydasını --help ilə yoxlayın\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr "--install-src istifadə edildiyində rpm faylları ilə nə edilə biləcəyi"
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1458,22 +1395,22 @@ msgstr ""
 "\n"
 "İndi nə etmək istəyirsiniz?"
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "Heçnə etmə"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr "Bəli, qur"
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr "Faylı qeyd et"
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1489,12 +1426,12 @@ msgstr ""
 "Bunun yerinə sadəcə olaraq qeyd etməyi də seçə bilərsiniz.\n"
 "Seçiminiz nədir?"
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, c-format
 msgid "Install it"
 msgstr "Qur"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1503,42 +1440,42 @@ msgstr ""
 "[%s] qovluğu onsuz da mövcuddur, xahiş edirik xəta raportu üçün başqa qovluq "
 "işlədin"
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Xəta raportu üçün [%s] cərgəsi yaradıla bilmədi"
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Paketləri qurma icazəsi ancaq ali istifadəçi verilib"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "Aşağıdakı paketlərin bir dənəsinə %s ehtiyac hiss edir:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Aşağıdakı paketlərin bir dənəsinə ehtiyac var:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Seçiminiz? (1-%d)"
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "Paket qurulumu..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "Başladılır..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1547,12 +1484,12 @@ msgstr ""
 "Bəzi istənən paketlər qurula bilmir:\n"
 "%s"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr "razısınız ?"
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1563,7 +1500,7 @@ msgstr ""
 "aşağıdakı paketlərin çıxardılması lazımdır:\n"
 "%s\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1572,15 +1509,15 @@ msgstr ""
 "Paketlərin yenilənməsi üçün aşağıdakı paketlərin çıxardılması lazımdır:\n"
 "%s"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
 "Asılıqları ortadan qaldırmaq üçün, aşağıdakı paketlər də qurulmalıdır (%d Mb)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1589,37 +1526,47 @@ msgstr ""
 "Aşağıdakı asıllılıqları qurmaq üçün ali istifadəçi olmalısınız:\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "qaynaq paketi alına bilmir, çıxılır"
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Lütfən \"%s\" medyasını [%s] avadanlığına yerləşdirin"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Hazır olanda Enter düyməsinə basın..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "`%s' paketi endirilir..."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% of %s bitdi, QV = %s, sür'ət = %s"
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% bitdi, sür'ət = %s"
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Aşağıdakı paketlər hökmsüz imzaya sahibdir"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Quruluma davam etmək istəyirsiniz ?"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1630,57 +1577,57 @@ msgstr ""
 "%s\n"
 "Sizə, urpmi databeyzinizi yeniləməyi məsləhət görürük."
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "Qurulum iflas etdi"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr "%s paylanır"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr "%s qurulur"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "`%s' paketi qurulur (%s/%s)..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Paket asılılıqlarına fikir vermədən qurmağı sınayım? (b/X) "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Quruluşu zorlayaraq sınayım (--force)? (b/X)"
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d qurulum daşınmaları bacarılmadı"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "Qurulum mümkündür"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "hər şey onsuzda quruludur"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr "urpmi yenidən başladılır"
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1706,22 +1653,22 @@ msgstr ""
 "\n"
 "və [seçənəklər] buradan gəlir\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - yeniləmə mediyumu yarat.\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr "  --probe-synthesis - synthesis faylını tapıb işlətməyə çalış.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr "  --probe-hdlist - hdlist faylını tapıb işlətməyə çalış.\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
@@ -1730,7 +1677,7 @@ msgstr ""
 "  --no-probe     - hər hansı bir synthesis ya da hdlist\n"
 "                   faylı tapmaya cəhd göstərmə.\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -1739,7 +1686,7 @@ msgstr ""
 "  --distrib      - bütün medyaları avtomatik olaraq qurulum medyumundan\n"
 "                    yarat.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1750,7 +1697,7 @@ msgstr ""
 "                   mediyum yarat, XXX main, contrib, updates ya da\n"
 "                   quraşdırılmış hər şey ola bilər ;-)\n"
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1759,7 +1706,7 @@ msgstr ""
 "  --from         - əkslərin siyahısı üçün verilən url'ni işlət, əsası\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1770,7 +1717,7 @@ msgstr ""
 "                   qurulu olan mandrake-release paketindən alınan\n"
 "                   distribyusiya buraxılışıdır.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
@@ -1779,7 +1726,7 @@ msgstr ""
 "  --arch         - verilən memarlığı işlət, əsası qurulmuş\n"
 "                   mandrake-release paketinin memarlığıdır.\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
@@ -1788,73 +1735,52 @@ msgstr ""
 "  --virtual      - həmişə yeni qalan virtual mediya yarat,\n"
 "                   ancaq file:// protokoluna icazə var.\n"
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - MD5SUM fayl yoxlamasını qeyri fəallaşdır.\n"
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "   -c            - başlıq ara yaddaşı cərgəsini təmizlə.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - hdlist fayllarının yaradılmasını məcbur et.\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"naməlum seçənəklər '%s'\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "cooker distribyusiyasının yeniləmələrini əlavə edə bilmərəm\n"
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "%s ünvanındakı mirrorlar alınır ..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"<hdlist'in nisbi yolu>nu --distrib ilə verməyə ehtiyac yoxdur"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "<hdlist'in nisbi yolu>nu --distrib ilə verməyə ehtiyac yoxdur"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr " \"%s\" medyası güncəllənə bilmir\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"<hdlistin nisbi yolu> mövcud deyildir\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<hdlistin nisbi yolu> mövcud deyildir\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"'with' şəbəkə medyasında əksikdir\n"
+msgid "`with' missing for network media\n"
+msgstr "'with' şəbəkə medyasında əksikdir\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr " \"%s\" medyası yaradıla bilmir\n"
@@ -1873,6 +1799,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "   -a            - medya seç.\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"naməlum seçənəklər '%s'\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1888,7 +1823,7 @@ msgstr ""
 "çıxardılacaq giriş mövcud deyildir\n"
 "(%s dan (dən) biri)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1897,29 +1832,29 @@ msgstr ""
 "istifadə qaydası: urpmi.update [seçənəklər] <ad> ...\n"
 "buradakı <ad> yenilənəcək mediyumun adıdır.\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - ancaq yeniləmə medyanı yenilə.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr "  --force-key    - gpg açarını yeniləməyə məcbur et.\n"
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - çıxardıla bilməyən medya seç.\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "güncəllənəcək bir şey yoxdur (medya əlavə etmək üçün urpmi.addmedia "
 "işlədin)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1928,7 +1863,7 @@ msgstr ""
 "güncəllənəcək giriş mövcud deyildir\n"
 "(%s dan (dən) biri)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1945,39 +1880,39 @@ msgstr ""
 "\n"
 "istifadə qaydası:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - mövcud paketləri göstər.\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - mövcud medyanı göstər.\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - mövcud medyanı və onların URL-lərini göstər.\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 "  --dump-config  - qurğuları urpmi.addmedia arqumenti formasında göstər.\n"
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr "  --list-nodes   - mövcud düyümləri --paralel işlədərkən göstər.\n"
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - mövcud paralel aliasları sırala.\n"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
@@ -1986,7 +1921,7 @@ msgstr ""
 "  --headers      - urpmi db üçün sıralanan üst mə'lumatları çıxart\n"
 "                   (ancaq ali istifadəçi).\n"
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
@@ -1994,79 +1929,135 @@ msgstr ""
 "  --sources      - endirmədən əvvəl bütün mənbə paketini ver (təkcə ali "
 "istifadəçi).\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
 msgstr "  --use-distrib  - urpmi-ni birbaşa distrib ağacından quraşdır.\n"
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - dəyişmə qeydi faylını göstər.\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - sorğunu paketin asıllılıqlarına qədər uzat.\n"
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr "  -u             - daha yeni buraxılış qurulu isə paketi çıxart/sil.\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - silinəcək paketlə çıxışı başa çatdır.\n"
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - paketin nəyə ehtiyacı olduğunu tərsdən axtar.\n"
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 "  -i             - insanın oxuya biləcəyi şəkildə faydalı mə'lumatları "
 "göstər.\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - adla birlikdə qrupları da göstər.\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - adla birlikdə buraxılış və yayını da göstər.\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - paketdəki faylları göstər.\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  əmr sətirində verilən adlar ya da rpm faylları sorğulanacaq.\n"
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-"urpmq: namə'lum seçənək \"-%s\", istifadə qaydasını --help ilə yoxlayın\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: \"%s\" rpm faylı oxuna bilmir\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes ancaq --parallel ilə bərabər istifadə edilə bilər"
+
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "Namə'lum webfetch `%s' !!!\n"
+
+#~ msgid "copy failed: %s"
+#~ msgstr "köçürtmə bacarılmadı: %s"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "wget mövcud deyil\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "wget bacarılmadı: %d ya da %d siqnalı ilə çıxdı\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "curl mövcud deyil\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "curl bacarılmadı: %d ya da %d siqnalı ilə çıxdı\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "rsync əksikdir\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "rsync bacarılmadı: %d ya da %d siqnalı ilə çıxdı\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "ssh mövcud deyil\n"
+
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpme: namə'lum seçənək \"-%s\", istifadə qaydasını --help ilə yoxlayın\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpmq: namə'lum seçənək \"-%s\", istifadə qaydasını --help ilə yoxlayın\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr ""
+#~ "Asılıqları ortadan qaldırmaq üçün, aşağıdakı paketlər də qurulmalıdır (%d "
+#~ "Mb)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "<hdlist'in nisbi yolu>nu --distrib ilə verməyə ehtiyac yoxdur"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "<hdlistin nisbi yolu> mövcud deyildir\n"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "'with' şəbəkə medyasında əksikdir\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpmq: namə'lum seçənək \"-%s\", istifadə qaydasını --help ilə yoxlayın\n"
diff --git a/po/bg.po b/po/bg.po
index 36c69b43..c60096f9 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-bg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2003-08-18 15:59+0300\n"
 "Last-Translator: Boyan Ivanov <boyan17@bulgaria.com>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
@@ -52,22 +52,22 @@ msgstr ""
 "Автоматична инсталация на пакети ...\n"
 "Вие пожелахте инсталация на пакет %s\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "Това добре ли е"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "Добре"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Отказ"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (Д/н) "
@@ -77,115 +77,52 @@ msgstr " (Д/н) "
 msgid "%s: command not found\n"
 msgstr "%s: командата не е намерена\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "where [options] are from\n"
 msgstr ""
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - показва това помощно съобщение.\n"
 
 # msgstr "  --group         - отпечатва групата тагове: group."
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, fuzzy, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "  --group         - отпечатва групата на тагове: group."
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, fuzzy, c-format
 msgid "                    defaults is %s.\n"
 msgstr "  --list           - отпечатва всички налични пакети.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr ""
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr ""
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "не мога да се справя с протокол %s"
 
-#: ../urpm.pm:189
-#, fuzzy, c-format
-msgid "copy failed: %s"
-msgstr "...копирането се провали"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr ""
-
-#: ../urpm.pm:240
-#, fuzzy, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget пропадане: изход с %d или сигнал %d\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr ""
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl се провали: изход с %d или сигнал %d\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr ""
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, fuzzy, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "wget пропадане: изход с %d или сигнал %d\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr ""
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr ""
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr ""
-
-# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
-# in this case must be "проводник"
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "... получаването не можа да се осъществи: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, fuzzy, c-format
 msgid "syntax error in config file at line %s"
 msgstr "невъзможно да се запише конфигурационен файл [%s]"
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
@@ -195,7 +132,7 @@ msgstr ""
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
 # "list" is translated in the meaning of "list file"
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
@@ -204,7 +141,7 @@ msgstr ""
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, fuzzy, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -215,7 +152,7 @@ msgstr ""
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, fuzzy, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
@@ -224,7 +161,7 @@ msgstr ""
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
@@ -233,35 +170,35 @@ msgstr ""
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "невъзможно определянето на източника на този hdlist файл : [%s]"
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, fuzzy, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "невъзможен достъпа до hdlist файла на \"%s\", посредника е игнориран"
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, fuzzy, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "невъзможен достъпа до лист файла на \"%s\", посредника е игнориран"
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, fuzzy, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "опит за пренебрегване на съществуващия посредник \"%s\", отхвърлен"
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -273,7 +210,7 @@ msgstr ""
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
 # "list" is translated in the meaning of "list file"
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, fuzzy, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr ""
@@ -282,117 +219,117 @@ msgstr ""
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, fuzzy, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "невъзможно намирането на hdlist файл за \"%s\", посредника е игнориран"
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, fuzzy, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "невъзможно да се намери лист файл за \"%s\", посредника е игнориран"
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "непоследователен списъков файл за \"%s\", посредника е игнориран"
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "невъзможен прегледа на лист файла за \"%s\", източника е игнориран"
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, fuzzy, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "твърде много точки на монтиране за сменяемия посредник \"%s\""
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr ""
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, fuzzy, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "невъзможно възтановяването на пътя за сменяемия посредник \"%s\""
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "невъзможно да се запише конфигурационен файл [%s]"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, fuzzy, c-format
 msgid "write config file [%s]"
 msgstr "невъзможно да се запише конфигурационен файл [%s]"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, fuzzy, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "невъзможно да се запише конфигурационен файл [%s]"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr ""
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr ""
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr ""
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, fuzzy, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "невъзможно осъвременяването на посредника \"%s\"\n"
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, fuzzy, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
 "update or --parallel"
 msgstr "  --all           - отпечатва всички тагове."
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, fuzzy, c-format
 msgid "examining synthesis file [%s]"
 msgstr "създай hdlist синтез файл за посредник  \"%s\""
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, fuzzy, c-format
 msgid "examining hdlist file [%s]"
 msgstr "прочети синтез файла [%s]"
@@ -400,86 +337,86 @@ msgstr "прочети синтез файла [%s]"
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
 # "list" is translated in the meaning of "list file"
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, fuzzy, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr ""
 "посредника \"%s\" прави опит да ползва вече използван лист, посредника е "
 "игнориран"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "грешка при четенето на hdlist или synthesis файла от източника \"%s\""
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr ""
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "пропускане на пакет %s"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "ще инсталира,вместо да обвнови пакета %s"
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "не мога да отворя rpmdb"
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "източникът \"%s\" вече съществува"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr ""
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "добавен източник %s"
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, fuzzy, c-format
 msgid "unable to access first installation medium"
 msgstr "невъзможен достъпа до посредника за първоначална инсталация"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr ""
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, fuzzy, c-format
 msgid "...copying failed"
 msgstr "...копирането се провали"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr ""
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
@@ -490,49 +427,57 @@ msgstr ""
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "получаване на hdlists файла..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr ""
 
-#: ../urpm.pm:1076
+# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
+# in this case must be "проводник"
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "... получаването не можа да се осъществи: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "невалидно hdlist описание \"%s\" в hdlists файла"
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, fuzzy, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "опит за избор на несъществуващ посредник \"%s\""
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, fuzzy, c-format
 msgid "selecting multiple media: %s"
 msgstr "опит за избор на множество посредници: %s"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr ""
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, fuzzy, c-format
 msgid "removing medium \"%s\""
 msgstr "премахване на посредника \"%s\""
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -542,7 +487,7 @@ msgstr ""
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, fuzzy, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -551,284 +496,284 @@ msgstr ""
 "посредника \"%s\" прави опит да ползва вече използван hdlist, посредника е "
 "игнориран"
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, fuzzy, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "нищо не е записано в лист файла за \"%s\""
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, fuzzy, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "невъзможно четенето на rpm файла [%s] от посредника \"%s\""
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr ""
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "изчисляване на md5 сумата на копирания hdlist (или synthesis)"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, fuzzy, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "...копирането се провали"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "проблем при четенето на синтез файл за източник  \"%s\""
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, fuzzy, c-format
 msgid "reading rpm files from [%s]"
 msgstr "прочети синтез файла [%s]"
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "невъзможно четенето на rpm файлове от [%s] : %s"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, fuzzy, c-format
 msgid "no rpm files found from [%s]"
 msgstr "прочети синтез файла [%s]"
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, fuzzy, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "невъзможно четенето на rpm файла [%s] от посредника \"%s\""
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, fuzzy, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "невъзможно четенето на rpm файла [%s] от посредника \"%s\""
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "невъзможно четенето на rpm файла [%s] от посредника \"%s\""
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr ""
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr ""
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, fuzzy, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "не е намерен hdlist файл за пасредника \"%s\""
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "невъзможно да се парсне hdlist файла за \"%s\""
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "невъзможност да се запише лист файл за \"%s\""
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, fuzzy, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "не е намерен hdlist файл за пасредника \"%s\""
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "нищо не е записано в лист файла за \"%s\""
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, fuzzy, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "невъзможно четенето на rpm файла [%s] от посредника \"%s\""
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, fuzzy, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "невъзможност да се запише лист файл за \"%s\""
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, fuzzy, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "невъзможност да се запише лист файл за \"%s\""
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, fuzzy, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "премахване на посредника \"%s\""
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr ""
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, fuzzy, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "създай hdlist синтез файл за посредник  \"%s\""
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "намерени %d хедъра в кеша"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, fuzzy, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "намерени %d хедъра в кеша"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, fuzzy, c-format
 msgid "mounting %s"
 msgstr "монтиране на %s\n"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, fuzzy, c-format
 msgid "unmounting %s"
 msgstr "монтиране на %s\n"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr ""
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "грешно rpm име на файла [%s]"
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "получавам rpm файла [%s] ... "
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "невъзможно регистрирането на rpm файл"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr ""
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "няма пакет наречен %s"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Тези пакети съдържат %s: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, fuzzy, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "невъзможно четенето на rpm файла [%s] от посредника \"%s\""
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
 "  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr ""
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "пакетът %s не е намерен."
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "донасяне,rpm база данни,провалено\n"
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, fuzzy, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "посредника \"%s\" не е избран"
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, fuzzy, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "невъзможно четенето на rpm файла [%s] от посредника \"%s\""
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
@@ -837,34 +782,34 @@ msgstr ""
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, fuzzy, c-format
 msgid "unable to access medium \"%s\""
 msgstr "невъзможен достъпа до посредника \"%s\""
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "лош вход: [%s]"
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, fuzzy, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "невъзможно четенето на rpm файла [%s] от посредника \"%s\""
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr ""
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr ""
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -872,82 +817,97 @@ msgstr ""
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, fuzzy, c-format
 msgid "unable to create transaction"
 msgstr "невъзможно създаването на посредника \"%s\"\n"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "изтриване на пакет %s"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "невъзможно премахването на пакет %s "
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr ""
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, fuzzy, c-format
 msgid "unable to install package %s"
 msgstr "Само superuser-а има правото да инсталира локални пакети"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, fuzzy, c-format
 msgid "due to missing %s"
 msgstr "липсва kdesu"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr ""
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, fuzzy, c-format
 msgid "in order to keep %s"
 msgstr "Само superuser-а има правото да инсталира локални пакети"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "за да може да се инсталира %s"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr ""
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr ""
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr ""
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr ""
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr ""
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr ""
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr ""
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Съжалявам,лош избор, опитайте отново\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -958,113 +918,103 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - показва това помощно съобщение.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, fuzzy, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - автоматично избиране на добър пакет от избора.\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, fuzzy, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --size          - отпечатва размера на тага: size."
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr " -v             - показва всички съобщения\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, fuzzy, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - избиране на всички съвпадения на командния ред.\n"
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-
-#: ../urpme:91
+#: ../urpme:83
 #, fuzzy, c-format
 msgid "unknown packages"
 msgstr "неизвестен пакет(и)"
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "неизвестен пакет"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr ""
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr ""
 
-#: ../urpme:107
+#: ../urpme:99
 #, fuzzy, c-format
 msgid "Checking to remove the following packages"
 msgstr "Един от тези пакети е необходим:"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
 "За да се запазят зависимостите,тези пакети ще бъдат деинсталирани (%d МБ)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (Д/н) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, fuzzy, c-format
 msgid "removing %s"
 msgstr "Само superuser-а има правото да инсталира локални пакети"
 
-#: ../urpme:123
+#: ../urpme:115
 #, fuzzy, c-format
 msgid "Removing failed"
 msgstr "...копирането се провали"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Съжалявам,лош избор, опитайте отново\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1075,44 +1025,44 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr ""
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, fuzzy, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --update       - създаване на ъпдейт посредник.\n"
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, fuzzy, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --update       - създаване на ъпдейт посредник.\n"
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, fuzzy, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr "  --update       - създаване на ъпдейт посредник.\n"
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr ""
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, fuzzy, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1122,165 +1072,165 @@ msgstr ""
 "  --quiet         - не отпечатва името на тага (по подразбиране ако не е "
 "зададен таг на командата"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, fuzzy, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --size          - отпечатва размера на тага: size."
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all           - отпечатва всички тагове.\n"
 
 # msgstr "  --group         - отпечатва групата тагове: group."
-#: ../urpmf:42
+#: ../urpmf:43
 #, fuzzy, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group         - отпечатва групата на тагове: group."
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, fuzzy, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size          - отпечатва размера на тага: size."
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, fuzzy, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --size          - отпечатва размера на тага: size."
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary       - отпечатва резюме за тага: summary.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, fuzzy, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description   - отпечатва описание на тага: description."
 
 # msgstr "  --group         - отпечатва групата тагове: group."
-#: ../urpmf:47
+#: ../urpmf:48
 #, fuzzy, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr "  --group         - отпечатва групата на тагове: group."
 
 # msgstr "  --group         - отпечатва групата тагове: group."
-#: ../urpmf:48
+#: ../urpmf:49
 #, fuzzy, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr "  --group         - отпечатва групата на тагове: group."
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, fuzzy, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr ""
 "  --requires      - отпечатва изисквания на тага: всички изисквания "
 "(множество редове)."
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --url          - отпечатва url тага: url.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, fuzzy, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr ""
 "  --requires      - отпечатва изисквания на тага: всички изисквания "
 "(множество редове)."
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, fuzzy, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr ""
 "  --requires      - отпечатва изисквания на тага: всички изисквания "
 "(множество редове)."
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, fuzzy, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr ""
 "  --requires      - отпечатва изисквания на тага: всички изисквания "
 "(множество редове)."
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, fuzzy, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr ""
 "  --conflicts     - отпечатва конфликтите на тага: всички конфликти "
 "(множество редове)."
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, fuzzy, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr ""
 "  --conflicts     - отпечатва конфликтите на тага: всички конфликти "
 "(множество редове)."
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
 msgstr ""
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, fuzzy, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr "  -f             - налагане на генерирането на hdlist файлове.\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, fuzzy, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - отпечатай версия,реализация и архитектура с име.\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e              - включва perl код направо като perl -e .\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, fuzzy, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 "  -u             - премахни пакета ако вече е инсталирана по добра версия.\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, fuzzy, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 "  -u             - премахни пакета ако вече е инсталирана по добра версия.\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, fuzzy, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr "  -a             - избиране на всички съвпадения на командния ред.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, fuzzy, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr "  -a             - избиране на всички съвпадения на командния ред.\n"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
 "%s\n"
 msgstr ""
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1291,33 +1241,33 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 "  --auto-select  - автоматично избира пакети за ъпгрейд на системата.\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr ""
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that leads to remove.\n"
 msgstr ""
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1325,188 +1275,175 @@ msgid ""
 "                   default is %d.\n"
 msgstr ""
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr ""
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
 msgstr ""
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
 msgstr ""
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
 "                   X or text mode.\n"
 msgstr ""
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr ""
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - избиране на всички съвпадения на командния ред.\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr ""
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr ""
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-"urpmi: непозната опция \"-%s\",моля вижте как се използва програмата с --"
-"help\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1519,22 +1456,22 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "Не прави нищо"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr ""
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr ""
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1544,66 +1481,66 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, fuzzy, c-format
 msgid "Install it"
 msgstr "Инсталацията провалена"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr ""
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr ""
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, fuzzy, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Само superuser-а има правото да инсталира локални пакети"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "Един от тези пакети е необходим за инсталация на %s:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Един от тези пакети е необходим:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Какъв е вашият избор? (1-%d) "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "Инсталиране на пакети..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "Инициализация..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr ""
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1614,7 +1551,7 @@ msgstr ""
 "трябва да бъдат премахнати за да бъдат обновени други\n"
 "%s\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1624,52 +1561,62 @@ msgstr ""
 "обновени:\n"
 "%s"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
 "За да се запазят зависимостите,тези пакети ще бъдат инсталирани (%d MB)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
 "%s\n"
 msgstr ""
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Моля, поставете източник с име \"%s\" в устройство [%s]"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Натиснете Enter,когато сте готови..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Сваляне на пакет `%s'..."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr ""
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr ""
+
+#: ../urpmi:606
 #, fuzzy, c-format
 msgid "The following packages have bad signatures"
 msgstr "Тези пакети съдържат %s: %s"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr ""
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1677,57 +1624,57 @@ msgid ""
 "You may want to update your urpmi database"
 msgstr ""
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "Инсталацията провалена"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, fuzzy, c-format
 msgid "distributing %s"
 msgstr "инсталиране %s\n"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, fuzzy, c-format
 msgid "installing %s"
 msgstr "инсталиране %s\n"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Инсталиране на пакет `%s' (%s/%s)..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Опит за инсталиране без проверка на зависимости? (д/Н) "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Опит за инсталиране даже по-силно (--force)? (д/Н) "
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d инсталационните транзакции не можаха да се осъществят"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "Инсталацията е възможна"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "всичко е инсталирано вече"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr ""
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1744,23 +1691,23 @@ msgstr ""
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, fuzzy, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - създаване на ъпдейт посредник.\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, fuzzy, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
 "  -h             - опитай да намериш и ползваш синтез or hdlist файл.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, fuzzy, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
@@ -1770,7 +1717,7 @@ msgstr ""
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -1780,7 +1727,7 @@ msgstr ""
 "инсталационен\n"
 "                   източник.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1788,14 +1735,14 @@ msgid ""
 "                   anything else that has been configured ;-)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr ""
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1803,85 +1750,72 @@ msgid ""
 "                   installed mandrake-release package.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
 "                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - почистване на хедър кеш директорията.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, fuzzy, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - налагане на генерирането на hdlist файлове.\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "получаване на огледални източници %s"
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr ""
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, fuzzy, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "невъзможно осъвременяването на посредника \"%s\"\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
+msgid "<relative path of hdlist> missing\n"
 msgstr ""
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
+msgid "`with' missing for network media\n"
 msgstr ""
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, fuzzy, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "невъзможно създаването на посредника \"%s\"\n"
@@ -1902,6 +1836,13 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr ""
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1916,7 +1857,7 @@ msgstr ""
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, fuzzy, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1927,34 +1868,34 @@ msgstr ""
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - обновява само източници на обновяване.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr ""
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "нищо за ъпгрейд (ползвай urpmi.addmedia за добавяне на посредник)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
 "(one of %s)\n"
 msgstr ""
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1965,69 +1906,69 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list           - отпечатва всички налични пакети.\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - показва източниците.\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, fuzzy, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-media   - показва източниците.\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, fuzzy, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr "  --all           - отпечатва всички тагове."
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, fuzzy, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --all           - отпечатва всички тагове."
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 "  --sources      - връща всички сорс пакети преди даунлоуд (само root).\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, fuzzy, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --all           - отпечатва всички тагове.\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, fuzzy, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -2035,57 +1976,73 @@ msgid ""
 msgstr ""
 "  -u             - премахни пакета ако вече е инсталирана по добра версия.\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, fuzzy, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "                    команден ред но без име на пакет)."
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, fuzzy, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -f             - отпечатай версия,реализация и архитектура с име.\n"
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, fuzzy, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -i             - отпечатва полезна информация в \"човешки\" вид.\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, fuzzy, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - отпечатай също групите с имена.\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - отпечатай версия и също така реализация с име.\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, fuzzy, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  --list           - отпечатва всички налични пакети.\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr ""
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, fuzzy, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "  --all           - отпечатва всички тагове."
 
 #, fuzzy
+#~ msgid "copy failed: %s"
+#~ msgstr "...копирането се провали"
+
+#, fuzzy
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "wget пропадане: изход с %d или сигнал %d\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "curl се провали: изход с %d или сигнал %d\n"
+
+#, fuzzy
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "wget пропадане: изход с %d или сигнал %d\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpmi: непозната опция \"-%s\",моля вижте как се използва програмата с --"
+#~ "help\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr ""
+#~ "За да се запазят зависимостите,тези пакети ще бъдат инсталирани (%d MB)"
+
+#, fuzzy
 #~ msgid ""
 #~ "  --name         - print tag name: rpm filename (assumed if no tag given "
 #~ "on\n"
diff --git a/po/br.po b/po/br.po
index e9feb1b1..628a57bc 100644
--- a/po/br.po
+++ b/po/br.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2004-01-18 21:28+0100\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: Breton <LL@li.org>\n"
@@ -44,22 +44,22 @@ msgid ""
 "You requested installation of package %s\n"
 msgstr ""
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr ""
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "Ya"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Nullañ"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr "(Y/n)"
@@ -69,382 +69,327 @@ msgstr "(Y/n)"
 msgid "%s: command not found\n"
 msgstr ""
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "where [options] are from\n"
 msgstr ""
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr ""
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr ""
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, c-format
 msgid "                    defaults is %s.\n"
 msgstr ""
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr ""
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr ""
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr ""
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr ""
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr ""
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr ""
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr ""
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr ""
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr ""
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr ""
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr ""
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr ""
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr ""
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr ""
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr ""
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
 "medium"
 msgstr ""
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr ""
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
 "ignored"
 msgstr ""
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr ""
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr ""
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr ""
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr ""
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr ""
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr ""
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr ""
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr ""
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
 "update or --parallel"
 msgstr ""
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr ""
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr ""
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr ""
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr ""
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr ""
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "fazi en ur zigeriñ rpmdb"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr ""
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr ""
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr ""
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr ""
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr ""
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr ""
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
 "found)"
 msgstr ""
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr ""
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr ""
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr ""
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr ""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "« %s »"
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -452,372 +397,387 @@ msgid ""
 "medium."
 msgstr ""
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
 "ignored"
 msgstr ""
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr ""
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr ""
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr ""
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr ""
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr ""
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr ""
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr ""
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr ""
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr ""
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr ""
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr ""
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr ""
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr ""
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr ""
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr ""
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr ""
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr ""
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr ""
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr ""
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "n'eo ket ur pakad anvet %s"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr ""
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr ""
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
 "  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr ""
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr ""
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr ""
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr ""
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr ""
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "O prientiñ ..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr ""
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr ""
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "lemel pakad %s"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr ""
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr ""
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr ""
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr ""
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr ""
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr ""
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr ""
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr ""
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr ""
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr ""
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr ""
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr ""
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr ""
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr ""
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr ""
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -828,112 +788,102 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr ""
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr ""
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr ""
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "pakad anavez"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr ""
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr ""
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr ""
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr "(y/N)"
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "lemel %s"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr ""
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr ""
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -944,38 +894,38 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr ""
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -983,148 +933,148 @@ msgid ""
 "                   line, incompatible with interactive mode).\n"
 msgstr ""
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr ""
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr ""
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr ""
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr ""
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr ""
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr ""
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr ""
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr ""
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr ""
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr ""
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr ""
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr ""
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr ""
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr ""
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr ""
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
 msgstr ""
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
 "%s\n"
 msgstr ""
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1135,32 +1085,32 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr ""
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that leads to remove.\n"
 msgstr ""
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1168,186 +1118,175 @@ msgid ""
 "                   default is %d.\n"
 msgstr ""
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr ""
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
 msgstr ""
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
 msgstr ""
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
 "                   X or text mode.\n"
 msgstr ""
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr ""
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr ""
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr ""
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1360,22 +1299,22 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr ""
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr ""
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr ""
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1385,66 +1324,66 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, c-format
 msgid "Install it"
 msgstr ""
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr ""
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr ""
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr ""
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr ""
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr ""
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr ""
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr ""
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr ""
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr ""
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1452,58 +1391,68 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
 msgstr ""
 
-#: ../urpmi:561 ../urpmi:570
+#: ../urpmi:488 ../urpmi:497
 #, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
 "%s\n"
 msgstr ""
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr ""
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr ""
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr ""
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr ""
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr ""
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr ""
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1511,57 +1460,57 @@ msgid ""
 "You may want to update your urpmi database"
 msgstr ""
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr ""
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr ""
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr ""
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr ""
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr ""
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr ""
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr ""
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr ""
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr ""
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1576,36 +1525,36 @@ msgid ""
 "and [options] are from\n"
 msgstr ""
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
 "                   hdlist file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1613,14 +1562,14 @@ msgid ""
 "                   anything else that has been configured ;-)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr ""
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1628,79 +1577,66 @@ msgid ""
 "                   installed mandrake-release package.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
 "                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr ""
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr ""
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr ""
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
+msgid "<relative path of hdlist> missing\n"
 msgstr ""
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
+msgid "`with' missing for network media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr ""
@@ -1717,6 +1653,13 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr ""
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1729,41 +1672,41 @@ msgid ""
 "(one of %s)\n"
 msgstr ""
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
 msgstr ""
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr ""
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr ""
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
 "(one of %s)\n"
 msgstr ""
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1774,120 +1717,110 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr ""
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr ""
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr ""
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr ""
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr ""
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr ""
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr ""
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr ""
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr ""
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr ""
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr ""
diff --git a/po/bs.po b/po/bs.po
index 339a7d89..855d09f6 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-bs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2004-03-01 14:13-0500\n"
 "Last-Translator: Vedran Ljubović <vljubovic@smartnet.ba>\n"
 "Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -53,22 +53,22 @@ msgstr ""
 "Automatska instalacija paketa...\n"
 "Zahtijevali ste instalaciju paketa %s\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "Je li ovo u redu?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "U redu"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Odustani"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (D/n) "
@@ -78,121 +78,60 @@ msgstr " (D/n) "
 msgid "%s: command not found\n"
 msgstr "%s: naredba nije pronađena\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "where [options] are from\n"
 msgstr ""
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - ispiši ovu poruku.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, fuzzy, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "  --group        - ispiši tag group: grupa.\n"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, fuzzy, c-format
 msgid "                    defaults is %s.\n"
 msgstr "  -l             - lista datoteka u paketu.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Nepoznat webfetch `%s' !!!\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "nepoznat protokol je definisan za %s"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "nije pronađen download program, podržani su: %s\n"
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "ne mogu rukovati protokolom: %s"
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "kopiranje nije uspjelo: %s"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "wget nedostaje\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget nije uspio: prekinuo sa %d tj. signalom %d\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "nedostaje curl\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl nije uspio: izašao sa %d ili signalom %d\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "rsync nedostaje\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "rsync nije uspio: prekinuo sa %d tj. signalom %d\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "nedostaje ssh\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% od %s završeno, preostalo = %s, brzina = %s"
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% zaveršeno, brzina = %s"
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...dobavljanje nije uspjelo: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "sintaksna greška u konfig datoteci na liniji %s"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr "medij \"%s\" pokušava koristiti već korištenu hdlist, ignorišem medij"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 "medij \"%s\" pokušava koristiti već iskorištenu listu, medij je ignorisan"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -201,39 +140,39 @@ msgstr ""
 "ne mogu se pobrinuti za medij \"%s\" pošto je list datoteka već iskorištena "
 "za drugi medij"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 "ne mogu koristiti ime \"%s\" za bezimeni medij pošto je ono već u upotrebi"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 "ne mogu uzeti medij \"%s\" u obzir pošto ne postoji datoteka s listom [%s]"
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "ne mogu odrediti medij ove hdlist datoteke [%s]"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "ne mogu pristupiti hdlist datoteci za \"%s\", ignorišem medij"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "ne mogu pristupiti list datoteci za \"%s\", ignorišem medij"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "pokušavam zaobići postojeći medij \"%s\", izbjegavam"
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -242,92 +181,92 @@ msgstr ""
 "virtuelni medij \"%s\" ne bi trebao imati hdlist ili list datoteku, "
 "ignorišem ga"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "virtuelni medij \"%s\" bi trebao imati čist url, ignorišem medij"
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "ne mogu naći hdlist datoteku za \"%s\", ignorišem medij"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "ne mogu naći list datoteku za \"%s\", ignorišem medij"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "nekoherentna datoteka s listom za \"%s\", medij je ignorisan"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "ne mogu istražiti list datoteku za \"%s\", medij je ignorisan"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "previše tačaka montiranja za izmjenjivi medij \"%s\""
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "uzimam izmjenjivi uređaj kao \"%s\""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "koristeći različit izmjenjivi uređaj [%s] za \"%s\""
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "ne mogu dobaviti put direktorija za uklonjivi medij \"%s\""
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "nisam u mogućnosti da zapišem konf. datoteku [%s]"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "zapiši konf. datoteku [%s]"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "Nije moguće istovremeno koristi parallel i use-distrib"
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "ne mogu obraditi \"%s\" u datoteci [%s]"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "ispitujem paralelni držač u datoteci [%s]"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "pronašao paralelni držač za čvorove: %s"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "koristi pridruženi medij za paralelni mod: %s"
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "ne mogu koristiti paralelnu opciju \"%s\""
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -336,90 +275,90 @@ msgstr ""
 "--synthesis se ne može koristiti zajedno sa --media, --excludemedia, --"
 "sortmedia, --update or --parallel"
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "ispitujem synthesis datoteku [%s]"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "ispitujem hdlist datoteku [%s]"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "virtuelni medij \"%s\" nije lokalan, ignorišem ga"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "problem u čitanju hdlist ili synthesis datoteke za medij \"%s\""
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "izvršavam drugi prolaz izračunavanja ovisnosti\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "preskačem paket %s"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "instaliraću umjesto unaprjeđenja paketa %s"
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "ne mogu otvoriti rpmdb"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "medij \"%s\" već postoji"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr "virtuelni medij mora biti lokalan"
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "dodao medij %s"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "ne mogu pristupiti prvom instalacionom mediju"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "kopiram hdlist datoteku..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "...kopiranje nije uspjelo"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "...kopiranje završeno"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
@@ -428,43 +367,49 @@ msgstr ""
 "ne mogu pristupiti prvom instalacionom mediju (nije pronađena Mandrake/base/"
 "hdlist datoteka)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "skidam hdlists datoteku..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "...download završen"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...dobavljanje nije uspjelo: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "neispravan hdlist opis \"%s\" u hdlist datoteci"
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "ne mogu izabrati nepostojeći medij \"%s\""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "biram više medija: %s"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "uklanjam medij \"%s\""
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -475,7 +420,7 @@ msgstr ""
 "ovo se moglo desiti ako ste ručno montirali direktorij prilikom pravljenja "
 "medija."
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -484,222 +429,222 @@ msgstr ""
 "virtuelni medij \"%s\" bi trebao imati ispravan hdlist ili synthesis, "
 "ignorišem ga"
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "kopiram opisnu datoteku za \"%s\"..."
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "izračunavam md5sum postojećeg izvornog hdlista (ili synthesis)"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "ispitujem MD5SUM datoteku"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "kopiram izvorni hdlist (ili synthesis) za \"%s\"..."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "kopiranje [%s] nije uspjelo (datoteka je sumnjivo mala)"
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "izračunavam md5sumu kopirane hdlist (ili synthesis) datoteke"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "kopiranje [%s] nije uspjelo (md5sum se ne poklapa)"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "problem pri čitanju synthesis datoteke za medij \"%s\""
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "čitam rpm datoteke iz [%s]"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "ne mogu čitati rpm datoteke iz [%s]: %s"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "nisam našao rpm datoteke sa [%s]"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "dobavljam hdlist (ili synthesis) za \"%s\"..."
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "pronašao traženi hdlist (ili synthesis) kao %s"
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "izračunavam md5sum za dobavljeni hdlist (ili synthesis)"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr "md5sum ne odgovara"
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "skidanje hdlist (ili synthesis) datoteke nije uspjelo"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "nije pronađena hdlist datoteka za medij \"%s\""
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "datoteka [%s] se već koristi na istom mediju \"%s\""
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "ne mogu obraditi hdlist datoteku za \"%s\""
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "ne mogu zapisati list datoteku za \"%s\""
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "ispisujem list datoteku za medij \"%s\""
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "ništa nije zapisano u list datoteku za \"%s\""
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "istražujem pubkey datoteku za \"%s\"..."
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...uveo sam ključ %s iz pubkey datoteke \"%s\"-a"
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "ne mogu uvesti pubkey datoteku za \"%s\""
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "dobavljam zaglavlja sa medija \"%s\""
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "pravim hdlist [%s]"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "izgrađena hdlist synthesis datoteka za medij \"%s\""
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "pronašao %d zaglavlja u spremniku"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "uklanjam %d prevaziđenih zaglavlja iz spremnika"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "montiram %s"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "demontiram %s"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "relocirao %s unosa u depslist"
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "nijedna stavka nije relocirana u depslist"
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "neispravno ime rpm datoteke [%s]"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "dobavljam rpm datoteku [%s] ..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "ne mogu pristupiti rpm datoteci [%s]"
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "ne mogu registrovati rpm datoteku"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "greška pri registrovanju lokalnih paketa"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "nema paketa pod imenom %s"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Sljedeći paketi sadrže %s: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "postoji više paketa sa istim imenom rpm datoteke \"%s\""
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "ne mogu ispravno obraditi [%s] na vrijednosti \"%s\""
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -708,62 +653,62 @@ msgstr ""
 "medij \"%s\" koristi neispravnu list datoteku:\n"
 "  mirror je vjerovatno zastario, pokušavam koristiti alternativnu metodu"
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "medij \"%s\" ne određuje lokaciju rpm datoteka"
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "paket %s nije pronađen"
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi baza podataka je zaključana"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "medij \"%s\" nije izabran"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "ne mogu pročitati rpm datoteku [%s] sa medija \"%s\""
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "nekoherentan medij \"%s\" je označen kao izmjenljiv, mada nije ustvari"
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "ne mogu pristupiti mediju \"%s\""
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "neispravan ulaz: [%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "dobavljam rpm datoteke za medij \"%s\"..."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "Pripremam..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "koristi proces %d za izvršenje transakcije"
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -771,82 +716,97 @@ msgstr ""
 "napravio transakciju za instaliranje na %s (ukloni=%d, instaliraj=%d, "
 "unaprijedi=%d)"
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr "ne mogu napraviti transakciju"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "uklanjam paket %s"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "ne mogu ukloniti paket %s"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "dodajem paket %s (id=%d, eid=%d, update=%d, file=%s)"
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "ne mogu instalirati paket %s"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "zbog nedostajućeg %s"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "zbog nezadovoljenih %s"
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr "pokušavam promovirati %s"
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr "kako bi zadržao %s"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "da bih instalirao %s"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "zbog konflikta sa %s"
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr "nije tražen"
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Neispravan potpis (%s)"
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "Neispravan ID ključa (%s)"
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Nedostaje potpis (%s)"
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "pogrešna deklaracija proxy-ja na komandnoj liniji\n"
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: ne mogu pročitati rpm datoteku \"%s\"\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Žao mi je, loš izbor, probaj kasnije\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -862,42 +822,42 @@ msgstr ""
 "\n"
 "upotreba:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - ispiši ovu poruku.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - automatski izaberi pakete u izborima.\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 "  --test         - provjeri da li se instalacija može ispravno izvršiti.\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 "  --force        - prisili pozivanje čak i ako neki paketi ne postoje.\n"
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - distribuirani urpmi preko mašina sa aliasom.\n"
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - koristi drugi dir. za rpm instalaciju.\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -906,72 +866,62 @@ msgstr ""
 "  --use-distrib  - podesi urpmi u letu iz distrib stabla, korisno za\n"
 "                   chroot de-instalacije uz korištenje --root opcije.\n"
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - rječiti mod.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - izaberi sve pakete koji odgovaraju izrazu.\n"
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: nepoznata opcija \"-%s\", provjerite upotrebu sa --help\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr "nepoznati paket"
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "nepoznat paket"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "uklanjanje paketa %s će pokvariti vaš sistem"
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr "Nema ništa za uklanjanje"
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "Provjeravam uklanjanje sljedećih paketa"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr "Da bih zadovoljio ovisnosti, ukloniću sljedeće pakete (%d MB)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (d/N) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "uklanjam %s"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr "Uklanjanje nije uspjelo"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Žao mi je, loš izbor, probaj kasnije\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -987,22 +937,22 @@ msgstr ""
 "\n"
 "upotreba:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - koristi samo medije za unaprjeđenje.\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - koristi samo navedene medije, razdvojene zarezom.\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - ne koristi navedene medije, razdvojene zarezom.\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1010,17 +960,17 @@ msgstr ""
 "  --sortmedia    - sortiraj medije prema podstringovima razdvojenim "
 "zarezom.\n"
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr "  --synthesis    - koristi navedeni synthesis umjesto urpmi baze.\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - rječiti mod.\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1031,88 +981,88 @@ msgstr ""
 "                   na komandnoj liniji, nekompativilno sa interaktivnim "
 "modom).\n"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --uniq         - ne ispisuj identične linije.\n"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all          - ispiši sve tagove.\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group        - ispiši tag group: grupa.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size         - ispiši tag size: veličina.\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --epoch        - ispiši tag epoch: epoha.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary      - ispiši tag summary: sažetak.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description  - ispiši tag description: opis.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr "  --sourcerpm    - ispiši tag sourcerpm: izvorni rpm.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr "  --packager     - ispiši tag packager: autor paketa.\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr ""
 "  --buildhost    - ispiši tag buildhost: računar na kojem je kompajliran.\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --url          - ispiši tag url: url.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr "  --provides     - ispiši tagove provides: svaki provides.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr "  --requires     - ispiši tag requires: svi zahtjevi.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files        - ispiši tag files: sve datoteke.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr "  --conflicts    - ispiši tag conflicts: svi konflikti.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr "  --obsoletes    - ispiši tag obsoletes: sve što je prevaziđeno.\n"
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
@@ -1121,51 +1071,51 @@ msgstr ""
 "  --env          - koristi navedenu okolinu (tipično izvještaj\n"
 "                   o bugu).\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr "  -i             - ne razlikuj velika i mala slova u uzorcima.\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - štampa verziju, izdanje i arhitekturu sa imenom.\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - uključi perl kod direktno kao perl -e.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 "  -a             - binarni I operator, tačan ako su oba izraza tačna.\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 "  -o             - binarni OR operator, tačan ako je jedan od izraza tačan.\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - unarno NE, tačno ako je izraz netačan.\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr "  (              - lijeva zagrada, otvara grupu izraza.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr "  )              - desna zagrada zatvara grupu izraza.\n"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
@@ -1174,12 +1124,12 @@ msgstr ""
 "callback je :\n"
 "%s\n"
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "koristim navedenu okolinu na %s\n"
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1195,19 +1145,19 @@ msgstr ""
 "\n"
 "upotreba:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - koristi zadani synthesis umjesto urpmi baze.\n"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 "  --auto-select  - automatski izaberi pakete za unaprijeđenje sistema.\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
@@ -1216,7 +1166,7 @@ msgstr ""
 "  --no-uninstall - nikad ne pitaj za deinstalaciju paketa, prekini "
 "instalaciju.\n"
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1225,7 +1175,7 @@ msgstr ""
 "  --keep         - čuvaj postojeće pakete ako je moguće, odbaci tražene\n"
 "                   pakete koji vode uklanjanju.\n"
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1236,37 +1186,37 @@ msgstr ""
 "                   paketi biti instalirani ili unaprijeđeni,\n"
 "                   podrazumijeva se %d.\n"
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - mala dužina transakcije, podrazumijeva se %d.\n"
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - nametni fuzzy pretragu (isto što i -y).\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - sljedeći paket je source paket (isto što i -s).\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - instaliraj samo izvorne pakete (bez binarnih).\n"
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - ukloni rpm iz spremnika prije svega ostalog.\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - čuvaj neiskorištene rpm-ove u spremniku.\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1275,7 +1225,7 @@ msgstr ""
 "  --allow-nodeps - dozvoli pitanje korisniku da instalira pakete\n"
 "                   bez provjere ovisnosti.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1284,7 +1234,7 @@ msgstr ""
 "  --allow-force  - dozvoli pitanje korisniku da instalira pakete bez\n"
 "                   provjere ovisnosti i integriteta.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1293,22 +1243,22 @@ msgstr ""
 "  --use-distrib  - podesi urpmi u letu iz distrib stabla, korisno za\n"
 "                   chroot instalacije uz korištenje --root opcije.\n"
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - koristi wget za download datoteka.\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - koristi curl za download datoteka.\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - ograniči brzinu downloada.\n"
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1317,7 +1267,7 @@ msgstr ""
 "  --resume       - nastavi prijenos djelomično prenesenih datoteka\n"
 "                   (--no-resume isključuje, što je i podrazumijevano).\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1326,7 +1276,7 @@ msgstr ""
 "  --proxy        - koristi navedeni HTTP proxy, broj porta se pretpostavlja\n"
 "                   da je 1080 (format je <proxyhost[:port]>).\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1335,7 +1285,7 @@ msgstr ""
 "  --proxy-user   - navedi korisnika i šifru potrebne za proxy\n"
 "                   autentifikaciju (format je <user:password>).\n"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1344,12 +1294,12 @@ msgstr ""
 "  --bug          - ispiši izvještaj o bugu u direktorij naveden u\n"
 "                   idućem argumentu.\n"
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - koristi X interfejs.\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1358,7 +1308,7 @@ msgstr ""
 "  --best-output  - izaberi najbolji interfejs ovisno o okruženju:\n"
 "                   X ili tekstualni.\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1367,76 +1317,65 @@ msgstr ""
 "  --verify-rpm   - provjeri potpis rpm-a prije instalacije\n"
 "                   (--no-verify-rpm isključuje, normalno je uključeno).\n"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - isključi puteve razdvojene zarezom.\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - isključi docs datoteke.\n"
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - izaberi sve pogotke na komandnoj liniji.\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 "  -p             - uključi pretragu 'provides' taga radi nalaženja paketa.\n"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - ne pretražuj 'provides' pri traženju paketa.\n"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - nametni fuzzy pretragu (isto što i --fuzzy).\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 "  -s             - sljedeći paket je source paket (isto što i --src).\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - tihi mod.\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 "  imena ili rpm datoteke dati na komandnoj liniji će biti instalirani.\n"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr "Izaberi lokaciju za snimanje"
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "pogrešna deklaracija proxy-ja na komandnoj liniji\n"
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: nepoznata opcija \"-%s\", provjerite upotrebu sa --help\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr "Šta mogu uraditi sa binarnim rpm datotekama koristeći --install-src"
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1457,22 +1396,22 @@ msgstr ""
 "\n"
 "Šta želite uraditi?"
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "Ne radi ništa"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr "Da, stvarno instaliraj"
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr "Snimi datoteku"
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1487,12 +1426,12 @@ msgstr ""
 "\n"
 "Možda želite da ih samo snimite. Šta je vaš izbor?"
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, c-format
 msgid "Install it"
 msgstr "Instaliraj"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1501,42 +1440,42 @@ msgstr ""
 "Direktorij [%s] već postoji, molim koristite neki drugi direktorij za "
 "prijavu buga ili ga obrišite"
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Ne mogu napraviti direktorij [%s] za prijavu buga"
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Samo administrator (root) može instalirati pakete"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "Jedan od sljedećih paketa je potrebno za instalaciju %s:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Jedan od sljedećih paketa je potreban:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Vaš izbor je? (1-%d) "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "Instalacija paketa..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "Inicijaliziram..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1545,12 +1484,12 @@ msgstr ""
 "Neki od traženih paketa se ne mogu instalirati:\n"
 "%s"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr "slažete li se ?"
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1561,7 +1500,7 @@ msgstr ""
 "uklonjeni da bi drugi mogli biti nadograđeni:\n"
 "%s\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1570,14 +1509,14 @@ msgstr ""
 "Sljedeći paketi trebaju biti uklonjeni da bi drugi mogli biti nadograđeni:\n"
 "%s"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr "Da bih zadovoljio ovisnosti, instaliraću sljedeće pakete (%d MB)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1586,37 +1525,47 @@ msgstr ""
 "Morate biti root da biste instalirali sljedeće ovisnosti:\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "ne mogu dobiti izvorne pakete, prekidam"
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Molim ubacite medij sa imenom \"%s\" u uređaj [%s]"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Pritisnite Enter kada budete spremni..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Downloadujem paket `%s'..."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% od %s završeno, preostalo = %s, brzina = %s"
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% zaveršeno, brzina = %s"
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Sljedeći paketi imaju neispravne potpise"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Želite li nastaviti instalaciju ?"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1627,57 +1576,57 @@ msgstr ""
 "%s\n"
 "Možda ćete trebati osvježiti vašu urpmi bazu podataka"
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "Instalacija nije uspjela"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr "distribuiram %s"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr "instaliram %s"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instaliram paket `%s' (%s/%s)..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Da pokušam instalaciju bez provjere ovisnosti? (d/N) "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Pokušaj instalaciju još jače (--force opcija)? (d/N) "
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d instalacionih transakcija nije uspjelo"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "Instalacija nije moguća"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "sve je već instalirano"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr "restartujem urpmi"
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1702,22 +1651,22 @@ msgstr ""
 "\n"
 "a [opcije] su\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - napravi medij za unaprjeđenje.\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr "  --probe-synthesis - pokušaj naći i koristiti synthesis datoteku.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr "  --probe-hdlist - pokušaj pronaći i koristiti hdlist datoteku.\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
@@ -1726,7 +1675,7 @@ msgstr ""
 "  --no-probe     - ne pokušavaj pronaći synthesis ili\n"
 "                   hdlist datoteku.\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -1735,7 +1684,7 @@ msgstr ""
 "  --distrib      - automatski napravi sve medije iz instalacionog\n"
 "                   medija.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1746,7 +1695,7 @@ msgstr ""
 "                   XXX može biti main, contrib, updates ili bilo šta\n"
 "                   drugo što konfigurišete ;-)\n"
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1755,7 +1704,7 @@ msgstr ""
 "  --from         - koristi navedeni url za listu mirrora, podrazumijeva se\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1767,7 +1716,7 @@ msgstr ""
 "                   vrijednost se uzima verzija koju daje instalirani\n"
 "                   paket mandrake-release.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
@@ -1777,7 +1726,7 @@ msgstr ""
 "arhitektura\n"
 "                   instaliranog mandrake-release paketa.\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
@@ -1786,73 +1735,52 @@ msgstr ""
 "  --virtual      - napravi virtuelne medije koji su uvijek osvježeni,\n"
 "                   dozvoljen je samo protokol file:// .\n"
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - isključi provjeru MD5SUM datoteke.\n"
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - očisti direktorij sa spremnikom zaglavlja.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - prisili pravljenje hdlist datoteka.\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"nepoznate opcije '%s'\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "ne mogu updatovati \"cooker\" verziju distribucije\n"
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "skidam mirror-e na %s ..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"nema potrebe da navodite <relativnu putanju do hdlist> sa --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "nema potrebe da navodite <relativnu putanju do hdlist> sa --distrib"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "ne mogu update-irati medij \"%s\"\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"<relativni put do datoteke hdlist> nedostaje\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<relativni put do datoteke hdlist> nedostaje\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"`with' nedostaje za mrežni medij\n"
+msgid "`with' missing for network media\n"
+msgstr "`with' nedostaje za mrežni medij\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "ne mogu napraviti medij \"%s\"\n"
@@ -1871,6 +1799,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - izaberi sve medije.\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"nepoznate opcije '%s'\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1885,7 +1822,7 @@ msgstr ""
 "stavka za brisanje nedostaje\n"
 "(jedan od %s)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1894,27 +1831,27 @@ msgstr ""
 "upotreba: urpmi.update [opcije] <ime> ...\n"
 "gdje je <ime> naziv medija za unaprjeđenje.\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - osvježi samo medije za update.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr "  --force-key    - prinudi update gpg ključa.\n"
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - izaberi ne-izmjenjive medije.\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "ništa za update (koristite urpmi.addmedia da dodate medij)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1923,7 +1860,7 @@ msgstr ""
 "stavka za update nedostaje\n"
 "(jedan od %s)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1939,22 +1876,22 @@ msgstr ""
 "\n"
 "upotreba:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - lista dostupnih paketa.\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - izlistaj dostupne medije.\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - izlistaj dostupne medije i njihove URLove.\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
@@ -1962,18 +1899,18 @@ msgstr ""
 "  --dump-config  - ispiši konfiguraciju u obliku argumenata za urpmi."
 "addmedia.\n"
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 "  --list-nodes   - izlistaj dostupne nodove kod korištenja --parallel.\n"
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - izlistaj dostupne paralelne aliase.\n"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
@@ -1982,14 +1919,14 @@ msgstr ""
 "  --headers      - izdvoji zaglavlja za izlistane pakete iz urpmi baze\n"
 "                   na stdout (samo root).\n"
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 "  --sources      - daj sve source pakete prije downloada (samo root).\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
@@ -1998,17 +1935,17 @@ msgstr ""
 "  --use-distrib  - podesi urpmi u letu iz distrib stabla.\n"
 "                   Ovo omogućuje ispitivanje distribucije.\n"
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - ispiši dnevnik izmjena.\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - proširi upit na ovisnosti paketa.\n"
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -2016,52 +1953,104 @@ msgid ""
 msgstr ""
 "  -u             - ukloni paket ako je već instalirana novija verzija.\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - kompletan izlaz sa paketom za uklanjanje.\n"
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - obrnuta pretraga za ono što zahtijeva paket.\n"
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -i             - ispiši korisne informacije u čitljivom obliku.\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - ispiši grupe sa imenom.\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - ispiši verziju i izdanje sa imenom.\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - lista datoteka u paketu.\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  imena ili rpm datoteke dati na komandnoj liniji će biti ispitani.\n"
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: nepoznata opcija \"-%s\", provjerite upotrebu sa --help\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: ne mogu pročitati rpm datoteku \"%s\"\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes se može koristiti samo sa --parallel"
+
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "Nepoznat webfetch `%s' !!!\n"
+
+#~ msgid "copy failed: %s"
+#~ msgstr "kopiranje nije uspjelo: %s"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "wget nedostaje\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "wget nije uspio: prekinuo sa %d tj. signalom %d\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "nedostaje curl\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "curl nije uspio: izašao sa %d ili signalom %d\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "rsync nedostaje\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "rsync nije uspio: prekinuo sa %d tj. signalom %d\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "nedostaje ssh\n"
+
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpme: nepoznata opcija \"-%s\", provjerite upotrebu sa --help\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmi: nepoznata opcija \"-%s\", provjerite upotrebu sa --help\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr "Da bih zadovoljio ovisnosti, instaliraću sljedeće pakete (%d MB)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "nema potrebe da navodite <relativnu putanju do hdlist> sa --distrib"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "<relativni put do datoteke hdlist> nedostaje\n"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "`with' nedostaje za mrežni medij\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmq: nepoznata opcija \"-%s\", provjerite upotrebu sa --help\n"
diff --git a/po/ca.po b/po/ca.po
index 372e8068..66c238d1 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-ca\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2004-03-06 11:10+0100\n"
 "Last-Translator: Albert Astals Cid <astals11@terra.es>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -51,22 +51,22 @@ msgstr ""
 "Instal·lació automàtica dels paquets...\n"
 "Heu demanat la instal·lació del paquet %s\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "És correcte?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "D'acord"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (S/n) "
@@ -76,7 +76,7 @@ msgstr " (S/n) "
 msgid "%s: command not found\n"
 msgstr "%s: no s'ha trobat l'ordre\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
@@ -85,116 +85,55 @@ msgstr ""
 "sintaxi: %s [opcions]\n"
 "on [opcions] pot ser\n"
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - mostra aquest missatge d'ajuda.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "   -g [group]     - restringeix els resultats al grup donat.\n"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, c-format
 msgid "                    defaults is %s.\n"
 msgstr "                    el valor per defecte és %s.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Programa per baixar de la xarxa `%s' desconegut !!!\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "el protocol definit per a %s és desconegut"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 "no s'ha trobat cap programa per baixar coses de la xarxa, els programes "
 "suportats són: %s\n"
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "incapaç de gestionar el protocol: %s"
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "la còpia ha fallat: %s"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "no es troba wget\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget ha fallat: ha sortit amb %d o senyal %d\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "no s'ha trobat curl\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl ha fallat: ha sortit amb %d o senyal %d\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "no s'ha trobat rsync\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "rsync ha fallat: ha sortit amb %d o senyal %d\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "falta ssh\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% de %s completat, TE = %s, velocitat = %s"
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% completat, velocitat = %s"
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...ha fallat la recuperació: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "error de sintaxi en fitxer de configuració a la línia %s"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr "la font \"%s\" ha provat d'utilitzar un hdlist en ús, font ignorada"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 "la font \"%s\" ha provat d'utilitzar un fitxer list en ús, font ignorada"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -203,40 +142,40 @@ msgstr ""
 "no s'ha pogut tenir cura de la font \"%s\" perquè el fitxer list és "
 "utilitzat per una altra font"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 "no es pot utilitzar el nom \"%s\" per a la font nom perquè ja està en ús"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 "no es pot tenir en compte la font \"%s\" perquè no existeix cap fitxer list "
 "[%s]"
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "no es pot determinar la font d'aquest fitxer hdlist [%s]"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "no es pot accedir al fitxer hdlist de \"%s\", font ignorada"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "no es pot accedir al fitxer list de \"%s\", s'ignora la font"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "provant de passar per alt la font existent \"%s\", evitant"
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -245,94 +184,94 @@ msgstr ""
 "la font virtual \"%s\" no hauria de tenir definit cap hdlist ni fitxer list, "
 "font ignorada"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "no es pot trobar el fitxer hdlist per a \"%s\", s'ignora la font"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "no es pot trobar el fitxer list per a \"%s\", s'ha ignorat la font"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "fitxer list incoherent per \"%s\", s'ha ignorat la font"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
 "no s'ha estat capaç d'inspeccionar el fitxer list per \"%s\", s'ignora la "
 "font"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "massa punts de muntatge per la font extraïble \"%s\""
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "agafant dispositiu extraïble com a \"%s\""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "utilitzant un dispositiu extraïble diferent [%s] per \"%s\""
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "no s'ha pogut determinar el camí i el nom de la font extraïble \"%s\""
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "no s'ha pogut escriure el fitxer de configuració [%s]"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "escriure fitxer de configuració [%s]"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "No es pot usar el mode paral·lel amb el mode use-distrib"
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "no es pot analitzar \"%s\" en el fitxer [%s]"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "s'està examinant manegador paral·lel en fitxer [%s]"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "s'ha trobat un manegador paral·lel per als nodes: %s"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "s'està utilitzant la font associada al mode paral·lel : %s"
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "no s'ha pogut usar l'opció de paral·lel \"%s\""
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -341,92 +280,92 @@ msgstr ""
 "--synthesis no es pot usar amb --media, --excludemedia, --sortmedia, --"
 "update ni --parallel"
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "s'està examinant el fitxer de síntesi [%s]"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "s'està examinant el fitxer hdlist [%s]"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "la font virtual \"%s\" no és local, font ignorada"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr ""
 "s'ha trobat un problema llegint el fitxer hdlist o de síntesi de la font \"%s"
 "\""
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "s'està fent segona passada per a computar dependències\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "s'està saltant el paquet %s"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "instal·laria en comptes d'actualitzar el paquet %s"
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "no s'ha pogut obrir rpmdb"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "la font \"%s\" ja existeix"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr "La font virtual ha de ser local"
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "s'ha afegit la font %s"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "no s'ha pogut accedir a la primera font d'instal·lació"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "s'està copiant el fitxer hdlists..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "..la còpia ha fallat"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "...còpia feta"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
@@ -435,43 +374,49 @@ msgstr ""
 "no s'ha pogut accedir la primera font d'instal·lació (no s'ha trobat fitxer "
 "Mandrake/base/hdlists)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "s'està recuperant el fitxer hdlists..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "...recuperació feta"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...ha fallat la recuperació: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "descripció hdlist incorrecta \"%s\" en el fitxer hdlists"
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "s'ha intentant seleccionar una font inexistent \"%s\""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "s'està seleccionant múltiples fonts: %s"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "s'està esborrant la font \"%s\""
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -481,7 +426,7 @@ msgstr ""
 "no s'ha pogut accedir a la font \"%s\",\n"
 "pot passar si havies muntat manualment el directori al crear la font."
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -490,222 +435,222 @@ msgstr ""
 "la font virtual \"%s\" hauria de tenir una font hdlist o synthesis vàlida, "
 "s'ignora la font"
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "s'està copiant el fitxer de descripció de \"%s\"..."
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "s'està computant el md5sum de la font hdlist (o síntesi) existent"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "s'està examinant el fitxer MD5SUM"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "s'està copiant l'hdlist (o la síntesi) font de \"%s\"..."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "la còpia de [%s] ha fallat (el fitxer és sospitosament petit)"
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "s'està computant el md5sum de la font hdlist (o síntesi)"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "la còpia de [%s] ha fallat (el md5sum no concorda)"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "s'ha trobat un problema llegint el fitxer de síntesi de la font \"%s\""
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "s'està llegint els fitxers rpm des de [%s]"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "no s'ha pogut llegir els fitxers rpm des de [%s]: %s"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "no s'han trobat fitxers rpm des de [%s]"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "s'està recuperant el hdlist font (o la síntesi) de \"%s\"..."
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr ""
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "s'està computant el md5sum de la font hdlist (o síntesi) recuperada"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr "el md5sum no concorda"
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "ha fallat la recuperació de l'hdlist (o la síntesi) de la font"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "no s'ha trobat el fitxer hdlist per a la font \"%s\""
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "el fitxer [%s] ja s'està utilitzant en la mateixa font \"%s\""
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "no es pot analitzar el fitxer hdlist de \"%s\""
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "no es pot escriure el fitxer list de \"%s\""
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "s'està escrivint el fitxer list per la font \"%s\""
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "no s'ha escrit res al fitxer list per a \"%s\""
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "s'està examinant el fitxer de clau pública de \"%s\"..."
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...s'ha importat la clau %s del fitxer de clau pública de \"%s\""
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "no s'ha pogut importat el fitxer de clau pública de \"%s\""
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "s'estan llegint les capçaleres de la font \"%s\""
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "s'està construint l'hdlist [%s]"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "s'ha construït el fitxer de síntesi hdlist per a la font \"%s\""
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "s'han trobat %d capçaleres a la memòria cau"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "s'estan esborrant %d capçaleres obsoletes de la memòria cau"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "s'està muntant %s"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "s'està desmuntant %s"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "%s entrades reubicades en depslist"
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "cap entrada reubicada en depslist"
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "el nom del fitxer rpm és incorrecte [%s]"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "s'està recuperant els fitxer rpm [%s] ..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "no s'ha pogut accedir al fitxer rpm [%s]"
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "no s'ha pogut registrar el fitxer rpm"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "error registrant els paquets locals"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "no hi cap paquet anomenat %s"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Els paquets següents contenen %s: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "hi ha múltiples paquets amb el mateix nom de fitxer rpm \"%s\""
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "no s'ha pogut analitzar correctament [%s] en el valor \"%s\""
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -715,63 +660,63 @@ msgstr ""
 "  la rèplica probablement no estigui actualitza, s'està provant un mètode "
 "alternatiu"
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "la font \"%s\" no defineix cap ubicació pels fitxers rpm"
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "no s'ha trobat el paquet %s."
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "la base de dades de l'urpmi està bloquejada"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "la font \"%s\" no ha estat seleccionada"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "no s'ha pogut llegir el fitxer rpm [%s] des de la font \"%s\""
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 "font incoherent \"%s\", marcada com a extraïble però no és així realment"
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "no s'ha pogut accedir a al font \"%s\""
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "entrada mal formada: [%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "s'està recuperant els fitxers rpm de la font \"%s\"..."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "S'està preparant..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "s'està usant el procés %d per executar la transacció"
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -779,82 +724,97 @@ msgstr ""
 "s'ha creat una transacció per instal·lar a %s (elimina=%d, instal·la=%d, "
 "actualitza=%d)"
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr "no s'ha pogut crear la transacció"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "s'està eliminant el paquet %s"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "no s'ha pogut eliminar el paquet %s"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "s'està afegint el paquet %s (id=%d, eid=%d, actualitza=%d, fitxer=%s)"
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "no s'ha pogut instal·lar el paquet %s"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "degut a que falten %s"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "degut a %s no satisfetes"
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr ""
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr "per tal de mantenir %s"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "per tal d'instal·lar %s"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "degut a conflictes amb %s"
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr "no demanat"
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Signatura no vàlida (%s)"
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "ID de clau no vàlid (%s)"
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Falta la signatura (%s)"
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr ""
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: no s'ha pogut llegir el fitxer rpm \"%s\"\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Elecció incorrecta, torneu-ho a provar\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -871,25 +831,25 @@ msgstr ""
 "\n"
 "sintaxi:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - mostra aquest missatge d'ajuda.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 "  --auto         - en escollir, selecciona un paquets automàticament.\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr "  --test         - verifica si la instal·lació pot ser duta a terme.\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
@@ -897,92 +857,82 @@ msgstr ""
 "  --force        - força l'execució tot i que hi hagi paquets que no "
 "existeixen.\n"
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - urpmi distribuït per els ordinadors de l'àlias.\n"
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - usa una altre arrel per la instal·lació de rpm.\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - mode detallat.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 "  -a             - selecciona tots els paquets que coincideixen amb "
 "l'expressió.\n"
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: opció desconeguda \"-%s\", comproveu-ne la sintaxi amb --help\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr "paquets desconeguts"
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "paquet desconegut"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "eliminar el paquet %s trencarà el vostre sistema"
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr "Res a eliminar"
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr ""
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
 "Per a complir les dependències, s'eliminaran els següents paquets (%d MB)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (s/N) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "s'està eliminant %s"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr "L'eliminació ha fallat"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Elecció incorrecta, torneu-ho a provar\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -999,41 +949,41 @@ msgstr ""
 "\n"
 "sintaxi:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - utilitza només les fonts d'actualització.\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 "  --media        - utilitza només les fonts donades, s'han de separar amb "
 "comes.\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - no usis les fonts donades, separades per comes.\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - utilitza la síntesi donada en comptes de la bd de urpmi.\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  -verbose             - mode detallat.\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1044,92 +994,92 @@ msgstr ""
 "                    s'indica cap etiqueta a la línia de comandes,\n"
 "                    incompatible amb el mode interactiu.\n"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --uniq         - no imprimeix línies idèntiques.\n"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all           - mostra totes les etiquetes.\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group         - mostra l'etiqueta group: grup.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size          - mostra l'etiqueta size: mida.\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr ""
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary       - mostra l'etiqueta summary: resum.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description   - mostra l'etiqueta description: descripció.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr "  --sourcerpm    - mostra l'etiqueta sourcerpm: rpm de codi font.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr "  --packager     - mostra l'etiqueta packager: empaquetador.\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr ""
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --url          - mostra l'etiqueta url: url.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr ""
 "  --provides      - mostra l'etiqueta provides: tots allò que proporciona.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr ""
 "  --requires      - mostra l'etiqueta requires: tots allò que necessita.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files         - mostra l'etiqueta files: tots els fitxers.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr ""
 "  --conflicts     - mostra l'etiqueta conflicts: tots els conflictes.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr ""
 "  --obsoletes     - mostra l'etiqueta obsoletes: tots els paquets que deixa "
 "obsolets.\n"
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
@@ -1138,24 +1088,24 @@ msgstr ""
 "  --env          - utilitza un entorn concret (normalment un\n"
 "                   informe d'errors).\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
 "  -i             - ignora les distincions de majúscules en els patrons.\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - mostra la versió, llançament i arquitectura amb el nom.\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
@@ -1163,41 +1113,41 @@ msgstr ""
 "  -a             - operador binari AND, cert si les dues expressions son "
 "certes.\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 "  -o             - operador binari OR, cert si una expressió és certa.\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - NOT unari, cert si la expressió és falsa.\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr "  (              - parentesi esquerre per obrir expressions de grup.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr "  )              - parentesi dret per tancar expressions de grup.\n"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
 "%s\n"
 msgstr ""
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1214,13 +1164,13 @@ msgstr ""
 "\n"
 "sintaxi:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - utilitza la síntesi donada en comptes de la bd de urpmi.\n"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
@@ -1228,7 +1178,7 @@ msgstr ""
 "  --auto-select  - selecciona automàticament els paquets per actualitzar el "
 "sistema.\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
@@ -1237,7 +1187,7 @@ msgstr ""
 "  --no-uninstall - mai demana desinstal·lar un paquet, avorta la "
 "instal·lació.\n"
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1247,7 +1197,7 @@ msgstr ""
 "paquets demanats\n"
 "                   que porten a la eliminació d'altres paquets.\n"
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1255,41 +1205,41 @@ msgid ""
 "                   default is %d.\n"
 msgstr ""
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - utilitza cerca difusa (igual que -y).\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 "  --src          - el paquet següent és un paquet font (igual que -s).\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 "  --install-src  - instal·la només paquets de codi font (cap binari).\n"
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 "  --clean        - esborra els rpm de la memòria cau abans de res més.\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr ""
 "  --noclean      - conserva els rpm que no s'utilitzen a la memòria cau.\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1299,7 +1249,7 @@ msgstr ""
 "sense\n"
 "                   comprovar les dependències.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1309,36 +1259,36 @@ msgstr ""
 "sense\n"
 "                   comprovar les dependències i la integritat.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - usa wget per a recuperar fitxers llunyans.\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - use curl per a recuperar fitxers llunyans.\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - limita la velocitat de descàrrega.\n"
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1349,7 +1299,7 @@ msgstr ""
 "                   que és el 1080 per defecte (el format és "
 "<ordinadorcentralproxy[:port]>).\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1359,7 +1309,7 @@ msgstr ""
 "autenticació\n"
 "                   del proxy (el format és <usuari:contrasenya>).\n"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1368,12 +1318,12 @@ msgstr ""
 "  --bug          - crea un informe d'errors en el directori\n"
 "                   que s'indica en l'argument següent.\n"
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - utilitza l'interfície X.\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1382,7 +1332,7 @@ msgstr ""
 "  --best-output  - escull la millor interfície d'acord amb l'entorn:\n"
 "                   el mode X o de text.\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1392,79 +1342,68 @@ msgstr ""
 "                   (--no-verify-rpm la deshabilita, per defecte està "
 "habilitat).\n"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - exclou els fitxers de documentació.\n"
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 "  -a             - selecciona totes les coincidències en la línia d'ordres.\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 "  -p             - permet la cerca en allò que proporcionen els paquets per "
 "a trobar-los.\n"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - no busquis en 'provides' per a trobar paquets.\n"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - força una cerca difusa (igual que --fuzzy).\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 "  -s             - el següent paquet és un paquet font (igual que --src).\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - mode silenciós.\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 "  els noms o fitxers rpm subministrats en la línia d'ordres seran "
 "instal·lats.\n"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr "Escolliu la ubicació un desar el fitxer"
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr ""
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: opció desconeguda \"-%s\", comproveu-ne la sintaxi amb --help\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1477,22 +1416,22 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "No facis res"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr "Sí, instal·la'l"
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr "Desa el fitxer"
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1502,12 +1441,12 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, c-format
 msgid "Install it"
 msgstr "Instal·la'l"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1516,42 +1455,42 @@ msgstr ""
 "El directori [%s] ja existeix, si us plau usa un altre directori per "
 "l'informe d'error o esborra'l"
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "No s'ha pogut crear el directori [%s] per a l'informe d'errors"
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "El superusuari és l'únic autoritzat per a instal·lar paquets"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "Un dels paquets següents necessita ser instal·lat %s:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Cal un dels paquets següents:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Quina és la vostra elecció? (1-%d) "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "Instal·lació de paquets..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "S'està inicialitzant..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1560,12 +1499,12 @@ msgstr ""
 "Alguns dels paquets demanats no es poden instal·lar:\n"
 "%s"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr "hi esteu d'acord?"
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1576,7 +1515,7 @@ msgstr ""
 "s'han d'eliminar per poder actualitzar uns altres:\n"
 "%s\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1585,15 +1524,15 @@ msgstr ""
 "Els paquets següents s'han d'eliminar per poder actualitzar uns altres:\n"
 "%s"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
 "Per complir les dependències, s'instal·laran els paquets següents (%d MB)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1602,37 +1541,47 @@ msgstr ""
 "Es necessita ser 'root' per a instal·lar les següents dependències:\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "no es poden recuperar els paquets font. S'està interrompent"
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Si us plau, inseriu la font anomenada \"%s\" al dispositiu [%s]"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Premeu Intro quan estigui fet..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "S'està descarregant el paquet `%s'..."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% de %s completat, TE = %s, velocitat = %s"
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% completat, velocitat = %s"
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Els paquets següents tenen signatures incorrectes"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Voleu continuar la instal·lació ?"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1644,58 +1593,58 @@ msgstr ""
 "%s\n"
 "Potser voleu actualitzar la base de dades urpmi"
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "La instal·lació ha fallat"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr "s'està distribuint %s"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr "s'està instal·lant %s"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "S'està instal·lant el paquet `%s' (%s/%s)..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr ""
 "Voleu intentar la instal·lació sense comprovar les dependències? (s/N) "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Voleu intentar la insta·lació encara amb més força (--force)? (s/N) "
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "han fallat %d transaccions d'instal·lació"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "La instal·lació és possible"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "Ja està tot instal·lat"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr "s'esta reiniciant urpmi"
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1722,22 +1671,22 @@ msgstr ""
 "\n"
 "i [opcions] són des de\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - crea una font d'actualització.\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr "  --probe-synthesis - intenta trobar un fitxer de síntesi.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr "  --probe-hdlist - intenta trobar un fitxer hdlist.\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
@@ -1746,7 +1695,7 @@ msgstr ""
 "  --no-probe     - no intenta buscar cap síntesi o\n"
 "                   fitxer hdlist.\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -1755,7 +1704,7 @@ msgstr ""
 "  --distrib      - automàticament crea tots les fonts des d'una font\n"
 "                   d'instal·lació.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1763,7 +1712,7 @@ msgid ""
 "                   anything else that has been configured ;-)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1772,7 +1721,7 @@ msgstr ""
 "  --from         - usa la url especificada per a la llista de rèpliques, \n"
 "                   la url per defecte és %s\n"
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1780,7 +1729,7 @@ msgid ""
 "                   installed mandrake-release package.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
@@ -1789,80 +1738,59 @@ msgstr ""
 "  --arch         - usa l'arquitectura especificada, el valor per defecte\n"
 "                   és l'arquitectura del la versió de Mandrake instal·lada.\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - deshabilita la comprovació MD5SUM.\n"
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - buida el directori de memòria cau de capçaleres.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - imposa la generació de fitxers hdlist.\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"opcions desconegudes '%s'\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "no es poden afegir actualitzacions d'una distribució cooker\n"
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "s'està recuperant la llista de repliques a %s ..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"no fa falta proporcionar el <camí relatiu de l'hdlist> amb --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "no fa falta proporcionar el <camí relatiu de l'hdlist> amb --distrib"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "no es pot actualitzar la font \"%s\"\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"falta el <camí relatiu de l'hdlist>\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "falta el <camí relatiu de l'hdlist>\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"falta el `with' per a les fonts de xarxa\n"
+msgid "`with' missing for network media\n"
+msgstr "falta el `with' per a les fonts de xarxa\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "no es pot crear la font \"%s\"\n"
@@ -1881,6 +1809,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - selecciona totes les fonts.\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"opcions desconegudes '%s'\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1896,7 +1833,7 @@ msgstr ""
 "falta l'entrada per a eliminar\n"
 "(una de %s)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1905,28 +1842,28 @@ msgstr ""
 "sintaxi: urpmi.update [opcions] <nom> ...\n"
 "on <nom> és el nom de la font a actualitzar.\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - utilitza només les fonts d'actualització.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr "  --force-key    - força l'actualització de la clau gpg.\n"
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - selecciona tots les fonts no extraïbles.\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "no hi ha res per actualitzar (utilitzeu urpmi.addmedia per afegir una font)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1935,7 +1872,7 @@ msgstr ""
 "falta l'entrada per actualitzar\n"
 "(una de %s)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1952,39 +1889,39 @@ msgstr ""
 "\n"
 "sintaxi:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - llista els paquets disponibles.\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - llista les fonts disponibles.\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - llista les fonts disponibles i la seva url.\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 "  --list-nodes   - llista els nodes disponibles quan s'utilitza --parallel.\n"
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - llista els àlias paral·lels disponibles.\n"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
@@ -1993,7 +1930,7 @@ msgstr ""
 "  --headers      - extreu capçaleres del paquet llistats des de urpmi db a\n"
 "                   'stdout' (només 'root').\n"
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
@@ -2001,24 +1938,24 @@ msgstr ""
 "  --sources      - dóna tots els paquets font abans de la baixada (només "
 "'root').\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - mostra els canvis.\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - amplia la cerca a les dependències dels paquets.\n"
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -2027,54 +1964,110 @@ msgstr ""
 "  -u             - elimina el paquet si hi ha instal·lada una versió més "
 "nova.\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - cerca inversa a que necessita el paquet.\n"
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 "  -i             - mostra informació útil en un forma llegible pels humans.\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - imprimeix grups amb el nom.\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr ""
 "  -r             - mostra la versió i llançament juntament amb el nom.\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - llista els fitxers del paquet.\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: opció desconeguda \"-%s\", comproveu-ne la sintaxi amb --help\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: no s'ha pogut llegir el fitxer rpm \"%s\"\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes només es pot usar amb --parallel"
+
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "Programa per baixar de la xarxa `%s' desconegut !!!\n"
+
+#~ msgid "copy failed: %s"
+#~ msgstr "la còpia ha fallat: %s"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "no es troba wget\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "wget ha fallat: ha sortit amb %d o senyal %d\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "no s'ha trobat curl\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "curl ha fallat: ha sortit amb %d o senyal %d\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "no s'ha trobat rsync\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "rsync ha fallat: ha sortit amb %d o senyal %d\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "falta ssh\n"
+
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpme: opció desconeguda \"-%s\", comproveu-ne la sintaxi amb --help\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpmi: opció desconeguda \"-%s\", comproveu-ne la sintaxi amb --help\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr ""
+#~ "Per complir les dependències, s'instal·laran els paquets següents (%d MB)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "no fa falta proporcionar el <camí relatiu de l'hdlist> amb --distrib"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "falta el <camí relatiu de l'hdlist>\n"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "falta el `with' per a les fonts de xarxa\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpmq: opció desconeguda \"-%s\", comproveu-ne la sintaxi amb --help\n"
diff --git a/po/cs.po b/po/cs.po
index 6034f887..90b8b076 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-cs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2004-03-25 22:51+0100\n"
 "Last-Translator: Michal Bukovjan <bukm@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -58,22 +58,22 @@ msgstr ""
 "Automatická instalace balíčků....\n"
 "Zadal jste instalaci balíčku %s\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "Je to správně?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (A/n) "
@@ -83,7 +83,7 @@ msgstr " (A/n) "
 msgid "%s: command not found\n"
 msgstr "%s: příkaz nenalezen\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
@@ -92,114 +92,53 @@ msgstr ""
 "použití: %s [volby]\n"
 "kde [volby] jsou tyto\n"
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - vypíše tuto nápovědu.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "   -g [group]     - omezí výsledky na danou skupinu.\n"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, c-format
 msgid "                    defaults is %s.\n"
 msgstr "                    výchozí je %s.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Neznámý webfetch `%s' !!!\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "neznámý protokol definovaný pro %s"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "nebyla nalezena aplikace pro stažení přes web, podporované jsou: %s\n"
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "nelze zpracovat protokol: %s"
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "kopírování selhalo: %s"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "chybí program wget\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "příkaz wget selhal: skončil s kódem %d nebo signálem %d\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "chybí program curl\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "příkaz curl selhal: skončil s kódem %d nebo signálem %d\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "chybí program rsync\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "příkaz rsync selhal: skončil s kódem %d nebo signálem %d\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "chybí program ssh\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% z %s dokončeno, ETA = %s, rychlost = %s"
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% dokončeno, rychlost = %s"
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...načítání selhalo: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "syntaktická chyba v souboru s nastavením na řádku %s"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 "zdroj \"%s\" bude ignorován, pokouší se použít již použitý soubor hdlist"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr "zdroj \"%s\" bude ignorován, pokouší se použít již použitý seznam"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -207,41 +146,41 @@ msgid ""
 msgstr ""
 "nelze pracovat se zdrojem \"%s\", pokud je seznam souborů využíván jiným"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 "nelze použít jméno \"%s\" pro nepojmenovaný zdroj protože to je již použito"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 "pokud neexistuje seznam souborů [%s], nelze zařadit zdroj \"%s\" mezi "
 "používané"
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "nelze zjistit zdroj pro tento soubor hdlist [%s]"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 "zdroj \"%s\" bude ignorován, protože nelze načíst soubor hdlist pro zdroj"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "nelze získat seznam souborů pro \"%s\", zdroj bude ignorován"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "pokus o vynechání existujícího zdroje \"%s\""
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -250,92 +189,92 @@ msgstr ""
 "virtuální zdroj \"%s\" by neměl mít definován soubor hdlist nebo seznamu, "
 "zdroj se ignoruje"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "virtuální zdroj \"%s\" by měl mít jasnou adresu URL, zdroj se ignoruje"
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "nelze nalézt soubor hdlist pro \"%s\", zdroj bude ignorován"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "nelze najít seznam souborů pro \"%s\", zdroj se ignoruje"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "nesouvislý seznam souborů pro \"%s\", zdroj bude ignorován"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "nelze prozkoumat seznam souborů pro \"%s\", zdroj bude ignorován"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "výměnné médium \"%s\" má příliš mnoho přípojných bodů"
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "pokládám vyjímatelné médium za \"%s\""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "použiji jiné vyjímatelné zařízení [%s] pro \"%s\""
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "nelze načíst cestu pro výměnné médium \"%s\""
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "nelze zapsat soubor s nastavením [%s]"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "zapisuji soubor s nastavením [%s]"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "Nelze použít paralelní režim spolu s režimem use-distrib"
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "nelze zpracovat \"%s\" v souboru [%s]"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "zkoumám paralelní zpracování v souboru [%s]"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "nalezeno paralelní zpracování pro uzly: %s"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "používám asociované zdroje pro paralelní režim: %s"
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "nelze použít paralelní volbu \"%s\""
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -344,90 +283,90 @@ msgstr ""
 "volbu --synthesis nelze použít s volbami --media, --excludemedia, --"
 "sortmedia, --update nebo --parallel"
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "zpracovávám soubor syntézy [%s]"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "zpracovávám soubor hdlist [%s]"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "virtuální zdroj \"%s\" není lokální, zdroj se ignoruje"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "problém při čtení souboru se syntézou nebo hdlist zdroje \"%s\""
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "počítám závislosti v druhém průchodu\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "přeskakuji balíček %s"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "místo aktualizace bych instaloval balíček %s"
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "nelze otevřít databázi rpmdb"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "zdroj \"%s\" již existuje"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr "virtuální zdroj musí být lokální"
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "přidán zdroj %s"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "nelze přistupovat k prvnímu instalačnímu médiu"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "kopíruji soubor hdlists..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "...kopírování selhalo"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "...kopírování ukončeno"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
@@ -436,43 +375,49 @@ msgstr ""
 "nelze přistupovat k prvnímu instalačnímu médiu (chybí soubor Mandrake/base/"
 "hdlists)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "načítám soubor hdlists..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "...načítání ukončeno"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...načítání selhalo: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "špatný popis hdlist \"%s\" v souboru hdlists"
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "pokouším se vybrat neexistující zdroj \"%s\""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "vybírám více zdrojů: %s"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "odebírám zdroj \"%s\""
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -482,7 +427,7 @@ msgstr ""
 "nelze přistupovat ke zdroji \"%s\",\n"
 "což se může stát, pokud jste ručně připojili adresář při vytváření zdroje."
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -491,228 +436,228 @@ msgstr ""
 "virtuální zdroj \"%s\" by měl mít platný soubor hdlist nebo syntézy, zdroj "
 "se ignoruje"
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "kopíruji soubor s popisy pro \"%s\"..."
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr ""
 "počítám součet md5 existujícího zdrojového souboru hdlist (nebo souboru se "
 "syntézou)"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "testuji MD5SUM soubor"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "kopíruji zdrojový hdlist (nebo soubor se syntézou) pro \"%s\"..."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "kopírování [%s] selhalo (soubor je podezřele malý)"
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr ""
 "počítám sumu md5 zkopírovaného zdrojového souboru hdlist (nebo soubor se "
 "syntézou)"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "kopírování [%s] selhalo (chyba v kontrolním součtu md5sum)"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "problém při čtení souboru se syntézou zdroje \"%s\""
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "načítám soubory RPM z [%s]"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "nelze číst soubory RPM z [%s]: %s"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "nebyl nalezen žádný soubor RPM na [%s]"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "načítám zdrojový hdlist (nebo soubor se syntézou) pro \"%s\"..."
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "nalezen zdrojový hdlist (nebo soubor se syntézou) jako %s"
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr ""
 "počítám součet md5 získaného zdrojového souboru hdlist (nebo souboru se "
 "syntézou)"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr "nerovnají se součty md5"
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "načítání zdrojového souboru hdlist (nebo souboru se syntézou) selhalo"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "nebyl nalezen soubor hdlist pro zdroj \"%s\""
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "soubor [%s] je již používán na tomtéž zdroji \"%s\""
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "nelze zpracovat soubor hdlist pro zdroj \"%s\""
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "nelze zapsat seznam souborů pro zdroj \"%s\""
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "zapisuji seznam souborů pro zdroj \"%s\""
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "není co zapisovat v seznamu souborů pro \"%s\""
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "zkoumá se soubor s veřejnými klíči \"%s\"..."
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...importuji klíč %s ze souboru veřejných klíčů \"%s\""
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "nelze importovat soubor s veřejnými klíči \"%s\""
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "načítám hlavičky ze zdroje \"%s\""
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "vytvářím hdlist [%s]"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "vytvářím syntézu pro hdlist pro zdroj \"%s\""
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "nalezeno %d hlaviček"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "odebírám %d starých hlaviček"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "připojuji %s"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "odpojuji %s"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "přesunuté položky %s v souboru depslist"
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "v souboru depslist nejsou žádné přesunuté položky"
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "neplatný název rpm souboru [%s]"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "načítám rpm soubor [%s] ..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "nelze zpřístupnit rpm soubor [%s]"
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "nelze registrovat rpm soubor"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "chyba při registraci lokálních balíčků"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "žádný balíček s názvem %s"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Následující balíčky obsahují: %s: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "více balíčků má stejný název souboru RPM \"%s\""
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "nelze korektně zpracovat [%s] kvůli hodnotě \"%s\""
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -721,62 +666,62 @@ msgstr ""
 "zdroj \"%s\" používá neplatný seznam souborů:\n"
 "  zrcadlo asi není aktuální, pokusím se použít alternativní metodu"
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "zdroj \"%s\" nedefinuje žádné umístění rpm souborů"
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "balíček %s nenalezen"
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "databáze pro urpmi je zamknutá"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "zdroj \"%s\" není vybrán"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "nelze načíst soubor RPM [%s] pro zdroj \"%s\""
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "nesouvislé médium \"%s\" je označeno jako vyjímatelné, ale není"
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "nelze přistoupit na zdroj \"%s\""
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "zkreslený vstup: [%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "načítám rpm soubory ze zdroje \"%s\"..."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "Připravuji..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "pro spuštění transakce se použije proces %d"
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -784,82 +729,97 @@ msgstr ""
 "vytvořena transakce pro instalaci na %s (odstranění=%d, instalace=%d, "
 "aktualizace=%d)"
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr "nelze vytvořit transakci"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "odstraňuje se balíček %s"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "nelze odstranit balíček %s"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "přidávám balíček %s (id=%d, eid=%d, aktualizace=%d, soubor=%s)"
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "nelze nainstalovat balíček %s"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "z důvodu chybějícího %s"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "z důvodu nesplněného %s"
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr "pokouším se postoupit %s"
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr "aby bylo možné zachovat %s"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "pro instalaci %s"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "z důvodu konfliktů s %s"
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr "nevyžádán"
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Neplatný podpis (%s)"
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "Neplatné ID klíče (%s)"
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Chybí podpis (%s)"
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "špatně zadaná proxy na příkazové řádce\n"
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: nemohu přečíst rpm soubor \"%s\"\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Je mi líto, to je špatná volba. Zkuste to znovu\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -876,43 +836,43 @@ msgstr ""
 "\n"
 "použití:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help           - vypíše tuto nápovědu.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto       - automaticky vybere balíček z výběru.\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr "  --test         - zkontrolovat, zda lze dokončit instalaci správně.\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 "  --force       - spustí program i v případě, že některé balíčky chybí.\n"
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 "  --parallel     - distribuovaný program urpmi na počítačích s přezdívkou.\n"
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr ""
 "  --root         - použít pro instalaci balíčků jiný kořenový adresář.\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -921,73 +881,63 @@ msgstr ""
 "  --use-distrib  - nastavit urpmi za provozu ze stromu distribuce, užitečné\n"
 "                   při (od)instalaci chroot s volbou --root.\n"
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - režim s výpisy.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - vybere všechny balíčky vyhovující výrazu.\n"
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: neznámá volba \"-%s\", způsob použití vyvoláte zadáním --help\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr "neznámé balíčky"
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "neznámý balíček"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "odebrání balíčku %s naruší funkčnost vašeho systému"
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr "Není co odebrat"
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "Kontrola odebrání následujících balíčků"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
 "Aby byly splněny závislosti, budou odebrány následující balíčky (%d MB)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (a/N) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "odstraňuje se %s"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr "Odebírání selhalo"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Je mi líto, to je špatná volba. Zkuste to znovu\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1004,40 +954,40 @@ msgstr ""
 "\n"
 "použití:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - použít pouze aktualizaci zdroje.\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media         - použít pouze uvedené zdroje, oddělené čárkou.\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - nepoužít zadané zdroje, oddělené čárkami.\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 "  --sortmedia    - třídit zdroje podle podřetězců oddělených čárkami.\n"
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - použít daný soubor se syntézou místo databáze urpmi.\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - užvaněný režim.\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1048,87 +998,87 @@ msgstr ""
 "tagu zadán\n"
 "z příkazové řádky, není kompatibilní s interaktivním režimem).\n"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --uniq         - nevytiskne stejné řádky.\n"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all           - vypíše všechny tagy.\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group         - vypíše tag skupina: group.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size          - vypíše tag velikost: size.\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --epoch        - vypíše tag epocha: epoch.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary       - vypíše tag souhrn: summary.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description   - vypíše tag popis: description.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr "  --sourcerpm    - vypíše tag sourcerpm: source rpm.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr "  --packager     - vypíše tag packager: packager.\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr "  --buildhost    - vypíše tag buildhost: build host.\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --url          - vypíše tag url: url.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr "  --provides      - vypíše tag poskytuje: all provides.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr "  --requires      - vypíše tag vyžaduje: all requires.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files         - vypíše tag soubory: all files.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr "  --conflicts     - vypíše tag konflikty: all conflicts.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr "  --obsoletes     - vypíše tag nahrazuje: all obsoletes.\n"
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
@@ -1137,52 +1087,52 @@ msgstr ""
 "  --env          - použij specifické prostředí (většinou hlášení\n"
 "                   o chybě).\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr "  -i         - ignorují se velká a malá písmena ve všech vzorech.\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f        - společně se jménem vypíše verzi, vydání a architekturu.\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e           - vloží kód Perl přímo jako perl -e.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 "  -a             - binární operátor AND, true pokud oba výrazy platí.\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 "  -o             - binární operátor OR, true pokud jeden z výrazů platí.\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - unární operátor NOT, true pokud výraz neplatí.\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr "  (              - levá závorka pro otevření skupiny výrazů.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr "  )              - pravá závorka pro uzavření skupiny výrazů.\n"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
@@ -1191,12 +1141,12 @@ msgstr ""
 "zpětné volání je:\n"
 "%s\n"
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "používá se specifické prostředí na %s\n"
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1213,20 +1163,20 @@ msgstr ""
 "\n"
 "použití:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - použít daný soubor se syntézou místo databáze urpmi.\n"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 "  --auto-select  - automaticky vybere balíčky pro aktualizaci systému.\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
@@ -1235,7 +1185,7 @@ msgstr ""
 "  --no-uninstall - nikdy se neptat na odstranění balíčku, přerušit "
 "instalaci.\n"
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1245,7 +1195,7 @@ msgstr ""
 "požadovaných\n"
 "                   balíčků, které vyžadují odstranění jiných.\n"
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1257,40 +1207,40 @@ msgstr ""
 "                   aktualizovat více balíčků než zadaná hodnota,\n"
 "                   výchozí hodnota je %d.\n"
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - malé velikost transakce, výchozí je %d.\n"
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy          - vnutit fuzzy vyhledávání. (stejné jako -y)\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - další balíček je zdrojový (stejné jako -s).\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 "  --install-src  - instalovat pouze balíček se zdroji (bez binárních "
 "souborů).\n"
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 "  --clean        - nejprve odstraní balíčky RPM z vyrovnávací paměti.\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - udržuje nepoužívané rpm v cache.\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1299,7 +1249,7 @@ msgstr ""
 "  --allow-nodeps - povolí žádost na uživatele, aby instaloval balíčky bez\n"
 "                   kontroly závislostí.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1308,7 +1258,7 @@ msgstr ""
 "  --allow-force  - povolí žádost na uživatele, aby instaloval balíčky bez\n"
 "                   kontroly závislostí a integrity.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1317,22 +1267,22 @@ msgstr ""
 "  --use-distrib  - nastavit urpmi za provozu ze stromu distribuce, užitečné\n"
 "                   při instalaci chroot s volbou --root.\n"
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget          - použije program wget pro načtení souborů.\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - použije program curl pro načtení souborů.\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - omezení rychlosti stahování.\n"
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1341,7 +1291,7 @@ msgstr ""
 "  --resume       - obnoví stahování částečně stažených souborů\n"
 "                   (--no-resume obnovení zakáže, implicitně je zakázáno).\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1350,7 +1300,7 @@ msgstr ""
 "  --proxy        - použij zadanou HTTP proxy, číslo portu se předpokládá\n"
 "                   1080, jako výchozí (formát je <proxyhost[:port]>).\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1359,7 +1309,7 @@ msgstr ""
 "  --proxy-user   - uživatel a heslo, které se má použít u ověření\n"
 "                   proxy (formát je <uživatel:heslo>).\n"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1368,12 +1318,12 @@ msgstr ""
 "  --bug          - vygeneruje hlášení o chybě do adresáře \n"
 "                   zadaného následujícím parametrem.\n"
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X           - použije X prostředí.\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1382,7 +1332,7 @@ msgstr ""
 "  --best-output  - vybere takový výstup, který odpovídá prostředí:\n"
 "                          grafický nebo textový režim.\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1391,74 +1341,63 @@ msgstr ""
 "  --verify-rpm   - zkontroluje před instalací signaturu balíčku RPM\n"
 "                   (volba --no-verify-rpm toto vypne, jinak povoleno).\n"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - nebrat v úvahu cestu oddělenou čárkami.\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - vynechá soubory s dokumentací.\n"
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - vybere všechny vyhovující z příkazové řádky.\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p           - pokusí se najít balíček v položkách provides.\n"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - nehledá balíček v položkách provides.\n"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - vnutit fuzzy vyhledávání (stejné jako --fuzzy).\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s              - další balíček je zdrojový (stejné jako --src).\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q           - režim bez výpisů.\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 "  názvy nebo soubory RPM zadané na příkazové řádce budou instalovány.\n"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr "Vyberte, kam chcete uložit soubor"
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "špatně zadaná proxy na příkazové řádce\n"
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: neznámá volba \"%s\", způsob použití vyvoláte zadáním --help\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr "Co lze učinit s binárními soubory RPM při použití --install-src"
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1480,22 +1419,22 @@ msgstr ""
 "\n"
 "Jak chcete pokračovat?"
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "Nedělat nic"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr "Opravdu jej nainstalovat"
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr "Uložit soubor"
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1510,12 +1449,12 @@ msgstr ""
 "\n"
 "Možná chcete tento balíček pouze uložit. Jak chcete pokračovat?"
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, c-format
 msgid "Install it"
 msgstr "Instalovat"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1524,43 +1463,43 @@ msgstr ""
 "Adresář [%s] již existuje, použijte prosím pro hlášení o chybě jiný adresář "
 "nebo jej odstraňte"
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Nelze vytvořit adresář [%s] pro uložení hlášení o chybě"
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Instalovat balíčky může pouze uživatel root"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr ""
 "Pro instalaci %s je zapotřebí nainstalovat jeden z následujících balíčků:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Je zapotřebí jeden z následujících balíčků:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Jaká je vaše volba? (1-%d) "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "Instalace balíčku..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "Inicializace..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1569,12 +1508,12 @@ msgstr ""
 "Některé požadované balíčky nebylo možné nainstalovat:\n"
 "%s"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr "souhlasíte?"
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1585,7 +1524,7 @@ msgstr ""
 "být odstraněny, aby bylo možné jiné aktualizovat:\n"
 "%s\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1594,15 +1533,15 @@ msgstr ""
 "Následující balíčky musí být odstraněny, aby bylo možné jiné aktualizovat:\n"
 "%s"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
 "Aby byly splněny závislosti, budou nainstalovány následující balíčky (%d MB)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1611,37 +1550,47 @@ msgstr ""
 "Pro instalaci následujících závislostí potřebujete mít právo root:\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "nelze získat zdrojový balíček, končím"
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Prosím vložte médium nazvané \"%s\" do zařízení [%s]"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Stiskněte klávesu Enter až budete připraveni..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Stahuje se balíček `%s'..."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% z %s dokončeno, ETA = %s, rychlost = %s"
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% dokončeno, rychlost = %s"
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Následující balíčky mají špatné signatury"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Chcete pokračovat v instalaci?"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1652,57 +1601,57 @@ msgstr ""
 "%s\n"
 "Možná potřebujete aktualizovat vaši databázi urpmi"
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "Chyba při instalaci"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr "distribuuji %s"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr "instaluji %s"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instaluji balíček `%s' (%s/%s)..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Mám zkusit instalaci bez kontroly závislostí? (a/N) "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Mám zkusit instalaci ještě razantněji (--force)? (a/N) "
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "Selhalo instalačních transakcí: %d"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "Instalace je možná"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "vše je již nainstalováno"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr "restartuji urpmi"
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1727,22 +1676,22 @@ msgstr ""
 "\n"
 "a [volby] jsou z\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - vytvoří zdroj pro aktualizaci.\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr "  --probe-synthesis - pokusí se najít a použít soubor se syntézou.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr "  --probe-hdlist - zkusí najít a použít soubor hdlist.\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
@@ -1751,7 +1700,7 @@ msgstr ""
 "  --no-probe     - nepokoušet se hledat žádný soubor hdlist\n"
 "                   nebo soubor se syntézou.\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -1760,7 +1709,7 @@ msgstr ""
 "  --distrib      - automaticky vytvoří všechny zdroje z instalačního\n"
 "                   média.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1771,7 +1720,7 @@ msgstr ""
 "                   distribuce, XXX může být main, contrib, updates nebo\n"
 "                   cokoli jiného co je nastaveno ;-)\n"
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1780,7 +1729,7 @@ msgstr ""
 "  --from         - pro seznam zrcadel se použije zadané URL, výchozí je\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1791,7 +1740,7 @@ msgstr ""
 "převzata\n"
 "                   z verze instalovaného balíčku mandrake-release.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
@@ -1800,7 +1749,7 @@ msgstr ""
 "  --arch         - použije se zadaná architektura, výchozí je arch.\n"
 "                   balíčku mandrake-release.\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
@@ -1809,73 +1758,52 @@ msgstr ""
 "  --virtual      - vytvoří virtuální zdroje, které jsou vždy aktuální,\n"
 "                   je povolen pouze protokol file://.\n"
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - vypnout kontrolu souborů MD5SUM.\n"
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c           - smaže dočasný adresář.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f         - provede generování hdlist souborů.\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"neznámé volby '%s'\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "nelze přidat aktualizace pro distribuci Cooker\n"
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "načítám zrcadla z %s ..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"s volbou --distrib není třeba zadávat <relativní cesta k hdlistu>"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "s volbou --distrib není třeba zadávat <relativní cesta k hdlistu>"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "nelze aktualizovat zdroj \"%s\"\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"<relativní cesta k hdlistu> chybí\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<relativní cesta k hdlistu> chybí\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"chybí `with' pro síťový zdroj\n"
+msgid "`with' missing for network media\n"
+msgstr "chybí `with' pro síťový zdroj\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "nelze vytvořit zdroj \"%s\"\n"
@@ -1894,6 +1822,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a           - vybere všechna média.\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"neznámé volby '%s'\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1908,7 +1845,7 @@ msgstr ""
 "záznam pro odebrání chybí\n"
 "(jeden z %s)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1917,27 +1854,27 @@ msgstr ""
 "použití: urpmi.update [volby] <jméno> ...\n"
 "kde <jméno> je název zdroje pro aktualizaci.\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - aktualizovat pouze aktualizační zdroje.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr "  --force-key    - přinutí k aktualizaci klíče gpg.\n"
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a           - vybere všechna nevyjímatelná média.\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "nic k aktualizaci (použijte urpmi.addmedia pro přidání zdroje)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1946,7 +1883,7 @@ msgstr ""
 "záznam pro update chybí\n"
 "(jeden z %s)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1963,41 +1900,41 @@ msgstr ""
 "\n"
 "použití:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - vypíše balíčky, které jsou k dispozici.\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - vypíše seznam dostupných zdrojů.\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - vypíše seznam dostupných zdrojů a jejich url.\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 "  --dump-config  - vypíše nastavení ve formě parametru pro urpmi.addmedia.\n"
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 "  --list-nodes   - vypíše seznam uzlů k dispozici při použití volby --"
 "parallel.\n"
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - seznam dostupných paralelních přezdívek.\n"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
@@ -2006,7 +1943,7 @@ msgstr ""
 "  --headers      - extrahuje hlavičky pro balíček z urpmi db na std.\n"
 "                   výstup.\n"
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
@@ -2014,7 +1951,7 @@ msgstr ""
 "  --source     - všechny zdrojové balíčky před stažením (pouze uživatel "
 "root).\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
@@ -2023,17 +1960,17 @@ msgstr ""
 "  --use-distrib  - nastaví urpmi za provozu ze stromu distribuce.\n"
 "                   To umožní dotaz na distribuci.\n"
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - vytiskne změnový log.\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d               - rozšířený dotaz na závislosti balíčku.\n"
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -2041,54 +1978,110 @@ msgid ""
 msgstr ""
 "  -u          - odebere balíček pokud je již instalována novější verze.\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - doplnit výstup balíčkem k odebrání.\n"
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - reverzní vyhledávání požadavků balíčku.\n"
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 "  -i             - tisk užitečných informací v člověkem čitelné podobě.\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g         - vypíše tag skupin společně se jménem.\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r              - společně se jménem vypíše verzi a vydání.\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - vypíše soubory v balíčku.\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 "  jméno nebo rpm soubory zadané na příkazové řádce, které jsou dotazovány.\n"
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: neznámá volba \"%s\", způsob použití vyvoláte s --help\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: nemohu přečíst rpm soubor \"%s\"\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "volbu --list-nodes lze použít pouze s volbou --parallel"
+
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "Neznámý webfetch `%s' !!!\n"
+
+#~ msgid "copy failed: %s"
+#~ msgstr "kopírování selhalo: %s"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "chybí program wget\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "příkaz wget selhal: skončil s kódem %d nebo signálem %d\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "chybí program curl\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "příkaz curl selhal: skončil s kódem %d nebo signálem %d\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "chybí program rsync\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "příkaz rsync selhal: skončil s kódem %d nebo signálem %d\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "chybí program ssh\n"
+
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpme: neznámá volba \"-%s\", způsob použití vyvoláte zadáním --help\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpmi: neznámá volba \"%s\", způsob použití vyvoláte zadáním --help\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr ""
+#~ "Aby byly splněny závislosti, budou nainstalovány následující balíčky (%d "
+#~ "MB)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "s volbou --distrib není třeba zadávat <relativní cesta k hdlistu>"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "<relativní cesta k hdlistu> chybí\n"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "chybí `with' pro síťový zdroj\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmq: neznámá volba \"%s\", způsob použití vyvoláte s --help\n"
diff --git a/po/cy.po b/po/cy.po
index d88735a5..2e5c22b6 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2004-03-12 08:42-0000\n"
 "Last-Translator: Rhoslyn Prys <rhoslyn.prys@meddal.org.uk>\n"
 "Language-Team: Cymraeg/Welsh <rhoslyn.prys@meddal.org.uk>\n"
@@ -49,22 +49,22 @@ msgstr ""
 "Gosodiad pecynnau awtomatig...\n"
 "Roeddech wedi gofyn i gael gosod pecyn %s\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "Mae'r model yn gywir"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "Iawn"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Dileu"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) "
@@ -74,7 +74,7 @@ msgstr " (Y/n) "
 msgid "%s: command not found\n"
 msgstr "%s: heb ganfod gorchymyn\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
@@ -83,115 +83,54 @@ msgstr ""
 "usage: %s [dewisiadau]\n"
 "lle mae [dewisiadau] o\n"
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help     - argraffu neges cymorth.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "   -g [group]     - cyfyngu canlyniadau i'r grwp.\n"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, c-format
 msgid "                    defaults is %s.\n"
 msgstr "                   rhagosodedig yw %s.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Webfetch `%s' anhysbys!!!\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "protocol anhysbys ar gyfer %s"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "heb ganfod webfetch, yn cael eu cynnal gan webfetch: %s\n"
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "methu trin protocol: %s"
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "methodd y copïo: %s"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "wget ar goll\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "methodd wget: gadael gyda%d neu signal %d\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "curl ar goll\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "methodd curl: gadael gyda %d neu signal %d\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "rysnc ar goll\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "methodd rsync:gadael gyda %d neu signal %d\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "ssh ar goll\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% o %s wedi cwblhau, Cyrraedd = %s, cyflymder = %s"
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% wedi cwblhau, cyflymder = %s"
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "... methodd ail-lwytho: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "gwall cystrawen yn ffeil ffurfweddiad yn llinell %s"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 "cyfrwng \"%s\" yn ceisio defnyddio rhestr mewn defnydd, anwybyddu'r cyfrwng"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 "cyfrwng \"%s\" yn ceisio defnyddio rhestr mewn defnydd, anwybyddu'r cyfrwng"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -200,41 +139,41 @@ msgstr ""
 "methu cymryd gofal o gyfrwng \"%s\" gan fod y rhestr ffeil yn cael ei "
 "ddefnyddio gan gyfrwng arall"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 "methu defnyddio enw \"%s\" ar gyfer cyfrwng dienw am ei fod mewn defnydd "
 "eisoes"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 "methu cymryd cyfrwng \"%s\" i ystyriaeth am nad oes rhestr ffeil [%s] yn "
 "bodoli"
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "methu enw cyfrwng y ffeil hdlist hon (%s)"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "methu cael mynediad i  ffeil hdlist\"%s\", anwybyddu'r cyfrwng"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "methu cael mynediad ffeil rhestr \"%s\", anwybyddu'r cyfrwng"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "ceisio osgoi'r cyfrwng presennol \"%s\", osgoi"
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -243,92 +182,92 @@ msgstr ""
 "dylai cyfrwng rhithiol \"%s\" fod a rhestr ffeiliau hdlist, anwybyddwyd y "
 "cyfrwng"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "dylai cyfrwng rhithiol  \"%s\" gael url clir, anwybyddu'r cyfrwng"
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "methu canfod rhestr ffeil \"%s\", cyfrwng wedi ei anwybyddu"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "methu canfod rhestr ffeil \"%s\", cyfrwng wedi ei anwybyddu"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "rhestr ffeil annealladwy \"%s\", cyfrwng wedi ei anwybyddu"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "methu archwilio rhestr ffeil \"%s\", cyfrwng wedi ei anwybyddu"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "gormod o bwyntiau gosod ar gyfer cyfrwng symudol \"%s\""
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "cymryd dyfais symudol fel \"%s\""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "defnyddio dyfais symudol wahanol (%s) ar gyfer \"%s\""
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "methu adfer enw llwybr ar gyfer cyfrwng symudadwy \"%s\""
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "methu ysgrifennu i ffeil ffurfweddiad (%s)"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "ysgrifennu ffeil ffurfweddu (%s)"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "Methu defnyddio'r modd paralel gyda'r modd use-distrib"
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "methu didoli ffeil hdlist \"%s\" yn ffeil (%s)"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "archwilio trinydd paralel mewn ffeil [%s]"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "canfod trinydd paralel ar gyfer nodau: %s"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "defnyddio cyfrwng cysylltiedig ar gyfer modd paralel: %s"
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "methu defnyddio dewis paralel \"%s\""
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -337,90 +276,90 @@ msgstr ""
 "-nid oes modd defnyddio synthesis gyda --media, --excludemedia, --sortmedia, "
 "--update neu --paralel"
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "archwilio ffeil synthesis [%s]"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "archwilio ffeil hdlist [%s]"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "nid yw'r rhith gyfrwng \"%s\" yn lleol, anwybyddu'r cyfrwng"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "problem darllen hdlist neu ffeil synthesis y cyfrwng \"%s\""
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "cyflawni ail ymgais i gyfrifo dibyniaethau\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "hepgor pecyn  %s"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "gosod yn lle uwchraddio pecyn %s"
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "methu agor rpmdb"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "cyfrwng \"%s\" yn bodoli eisoes"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr "rhaid i'r rhith gyfrwng fod yn lleol"
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "ychwanegwyd cyfrwng %s"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "methu cael mynediad i gyfrwng gosod cyntaf"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "copïo ffeil hdlists..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "...methodd y copïo"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "...cwblhau'r copïo"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
@@ -429,43 +368,49 @@ msgstr ""
 "methu cael mynediad i'r cyfrwng gosod cyntaf (heb ganfod ffeil Mandrake/base/"
 "hdlists)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "adfer ffeil hdlists..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr ".cwblhau adfer"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "... methodd ail-lwytho: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "disgrifiad hdlist annilys \"%s\" yn rhestr ffeilio hdlists"
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "ceisio dewis y cyfrwng nad yw'n bod \"%s\""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "dewis aml-gyfrwng: %s"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "dewis cyfrwng \"%s\":"
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -475,7 +420,7 @@ msgstr ""
 "maethu cael mynediad i gyfrwng \"%s\",\n"
 "gall hyn ddigwydd os ydych wedi gosod y cyfeiriadur gyda wrth greu'r cyfrwng."
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -484,222 +429,222 @@ msgstr ""
 "dylai'r rhith gyfrwng \"%s\" gael hdlist ffynhonnell ddilys neu synthesis, "
 "anwybyddu'r cyfrwng"
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "copïo ffeil disgrifiad o \"%s\""
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "cyfrifo md5sum ffynhonnell hdlist presennol (neu synthesis)"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "archwilio ffeil MD5SUM"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "copïo ffynhonnell hdlist (neu synthesis) \"%s\"..."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "methodd copïo (%s) (Mae'r ffeil yn rhy fach)"
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "cyfrifo md5sum o ffynhonnell hdlist gopïwyd (neu synthesis)"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "methodd copïo (%s) (md5sum gwallus)"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "anhawster darllen synthesis ffeil cyfrwng \"%s\""
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "darllen ffeiliau rpm o [%s]"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "methu darllen ffeiliau rpm o (%s): %s"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "heb ganfod ffeiliau rpm o [%s]"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "adfer ffynhonnell hdlist (neu synthesis) \"%s\"..."
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "canfod hdlist (neu synthesis) holwyd fel %s"
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "cyfrifo md5sum o ffynhonnell hdlist adferwyd (neu synthesis)"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr "anghysondeb md5sum"
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "methodd adfer ffynhonnell hdlist (neu synthesis)"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "dim ffeil hdlist synthesis file ar gyfer cyfrwng \"%s\""
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "file [%s] yn cael ei ddefnyddio eisoes yn yr un cyfrwng \"%s\""
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "methu didoli ffeil hdlist \"%s\""
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "methu ysgrifennu i ffeil rhestr \"%s\""
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "ysgrifennu rhestr ffeil  ar gyfer cyfrwng \"%s\""
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "dim wedi ei ysgrifennu yn ffei rhestr ar gyfer \"%s\""
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "archwilio ffeil pubkey \"%s\""
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...allwedd %s wedi ei fewnforio o ffeil pubkey \"%s\""
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "methu mewnforio ffeil pubkey \"%s\""
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "darllen pennawd o'r cyfrwng \"%s\""
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "adeiladu hdlist [%s]"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "adeiladu ffeil hdlist synthesis file ar gyfer cyfrwng \"%s\""
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "canfod %d pennawd mewn storfa"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "tynnu hen benawdau %d yn y storfa"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "gosod %s"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "dadosod %s"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "ailganfod cofnodion %s yn depslist"
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "dim cofnodion wedi eu symud i depslip"
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "enw ffeil rpm annilys [%s]"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "adfer ffeil rpm (%s)..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "methu cael mynediad  ffeil rpm (%s)"
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "methu cofrestr ffeil rpm"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "gwall cofrestru pecynnau lleol"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "heb enwi pecyn %s"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Mae pecynnau canlynol yn cynnwys %s: %s:"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "mae yna becynnau niferus gyda'r un enw ffeil rpm \"%s\""
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "methu didoli (%s) yn gywir ar werth \"%s\""
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -708,144 +653,159 @@ msgstr ""
 "cyfrwng \"%s\" yndefnyddio rhestr ffeiliau annilys:\n"
 "  nid yw'r drych yn un diweddar, ceisiwch ddull arall"
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "nid yw cyfrwng \"%s\" yn diffinio unrhyw leoliad ar gyfer ffeiliau rpm"
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "heb ganfod pecyn %s"
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "cronfa ddata urmi wedi cloi"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "heb ddewis cyfrwng \"%s\""
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "methu darllen ffeil rpm (%s) o gyfrwng \"%s\""
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "cyfrwng annealladwy \"%s\" wedi ei nodi'n symudadwy ond nid yw"
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "methu cael mynediad at gyfrwng. \"%s\""
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "allbwn gwallus: [%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "adfer ffeiliau rpm o gyfrwng [%s]"
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "Paratoi..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "defnyddio proses %d ar gyfer gweithredu trosglwyddiad"
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 "crëwyd trosglwyddiad ar gyfer gosod ar %s (tynnu=%d, gosod=%d, uwchraddio=%d)"
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr "methu creu trosglwyddiad."
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "tynnu pecyn %s."
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "methu tynnu pecyn %s"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "ychwanegu pecyn %s (id=%d, eid=%d, update=%d, file=%s)"
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "methu gosod pecyn %s"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "oherwydd %s coll"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "%s heb ei foddloni"
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr "ceisio hybu %s"
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr "fel modd i gadw %s"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "er mwyn gosod %s"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "oherwydd gwrthdaro gyda %s"
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr "diofyn"
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Llofnod annilys (%s)"
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "Enw Allwedd Annilys (%s)"
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Llofnod coll (%s)"
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "datganiad dirprwy gwallus ar y llinell orchymyn\n"
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: methu darllen ffeil rpm \"%s\"\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Dewis gwael, ceisiwch eto\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -861,24 +821,24 @@ msgstr ""
 "\n"
 "defnydd:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - argraffu neges cymorth.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - dewis pecyn ynn awtomatig o fewn dewisiadau.\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr "  --test          - gwirio os oes modd gosod yn iawn.\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
@@ -886,18 +846,18 @@ msgstr ""
 "  --force        - gorfodi galwad hyd yn oed os na yw rhai pecynnau'n "
 "bodoli.\n"
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 "  --paralel    - urpmi wedi ei ddosbarthu ar draws beiriannau eraill.\n"
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - defnyddio root arall ar gyfer gosod rpm.\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -906,73 +866,63 @@ msgstr ""
 "  --use-distrib  - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n"
 "                   wrth (ddad)osod chroot gyda dewis o  --root.\n"
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  --verbose      - modd llafar.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - select all packages matching expression.\n"
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: dewis anhysbys \"-%s\", gwirio defnydd gyda --help\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr "pecynnau anhysbys"
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "pecyn anhysbys"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "bydd tynnu pecynnau %s yn torri'r system"
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr "Dim i'w dynnu"
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "Ticio i ddileu'r pecynnau canlynol"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
 "I fodloni dibyniaethau, bydd y pecynnau canlynol yn cael eu tynnu (%d MB)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (y/N) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "tynnu %s"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr "Methodd y tynnu"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Dewis gwael, ceisiwch eto\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -988,23 +938,23 @@ msgstr ""
 "\n"
 "defnydd:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media          - defnyddio'r cyfrwng, wedi ei ran gan coma.\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 "  --excludemedia - peidio defnyddio'r cyfrwng hwn, rhannwyd gyda choma.\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1012,17 +962,17 @@ msgstr ""
 "   --sortmedia    - didoli'r cyfrwng yn ôl llinynnau wedi eu rhannu gyda "
 "choma.\n"
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr "  --synthesis    - defnyddio'r synthesis yn lle urpmi db.\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - modd llafar.\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1034,89 +984,89 @@ msgstr ""
 "                    cael ei roi ar y linell orchymyn gyda modd "
 "rhyngweithiol).\n"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --uniq         - peidio argraffu llinellau yr un fath.\n"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all          - argraffu pob tag.\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group        - argraffu grwp tag: grwp.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size         - argraffu maint tag: maint.\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --epoch        - argraffu cyfnod tag: cyfnod.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary      - argraffu crynodeb tag: crynodeb.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --summary      - argraffu disgrifiad tag: disgrifiad.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr "  --sourcerpm    - argraffu ourcerpm tag: ffynhonnell rpm.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr "  --packager      - argraffu pencynydd tag: pencynydd.\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr "  --buildhost    - argraffu buildhost tag: build host.\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --url          - argraffu tag url: url.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr "  --provides      - tag argraffu'n darparu: pob darpariaeth. \n"
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr "  --requires     - argraffu tagiau angenrheidiol: pob anghenraid\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files        - argraffu fagiau ffeiliau: pob ffeil\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr "  --conflicts    - tag argraffu'n gwrthdaro: pob gwrthdaro\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr ""
 "  --obsoletes     - argraffu hen dagiau: yr holl hen rai (llinellau "
 "niferus).\n"
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
@@ -1125,23 +1075,23 @@ msgstr ""
 "  --env          - defnyddio amgynlchedd benodol (adroddiad gwall \n"
 "                   fel rheol.\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
 "  -i             - anwybyddu gwahaniaeth maint llythrennau ym mhob patrwm.\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - argraffu fersiwn a rhyddhad ac arch gydag enw.\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - cynnwys perl cod yn union fel perl -e.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
@@ -1149,7 +1099,7 @@ msgstr ""
 "  -a             - gweithredwr deuaidd AND, gwir os yw'r ddau ymadrodd yn "
 "gywir.\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
@@ -1157,22 +1107,22 @@ msgstr ""
 "  -o             - gweithredwr deuaidd OR, gwir os yw'r ddau ymadrodd yn "
 "gywir.\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - unaidd NOT, true os yw'r mynegiad yn false.\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr "  (              - parenthesis chwith i agor mynegiad grwp.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr "  )              - parenthesis de i gau mynegiad grwp.\n"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
@@ -1181,12 +1131,12 @@ msgstr ""
 "galw nôl yw: \n"
 "%s\n"
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "ddefnyddio amgylchedd penodol ar %s\n"
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1202,25 +1152,25 @@ msgstr ""
 "\n"
 "defnydd:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - defnyddio'r synthesis yn lle urpmi db.\n"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - dewis pecynnau'n awtomatig i uwchraddio'r system.\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr "  --no-uninstall - peidio gofyn i ddadosod pecyn, atal gosod.\n"
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1229,7 +1179,7 @@ msgstr ""
 "  --keep         - cadw'r pecynnau presennol os yn bosibl, gwrthod\n"
 "                   pecynnau sy'n arwain at dynnu.\n"
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1241,39 +1191,39 @@ msgstr ""
 "                   eu gosod neu eu uwchraddio\n"
 "                   rhagosodiad yw %d.\n"
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - hyd drosglwyddiad byr, rhagosodiad yw %d.\n"
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - mynnu chwiliad fuzzy (fel -y).\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 "  --src          - pecyn nesaf yn becyn ffynhonnell (yr un peth â -s).\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 "  --install-src  - gosod pecynnau ffynhonnell yn unig (dim binaries).\n"
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - tynnu rpm o'r storfa cyn unrhyw beth arall.\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - cadw'r rpm sydd heb ei ddefnyddio yn y storfa.\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1282,7 +1232,7 @@ msgstr ""
 "  --allow-nodeps - caniatáu gofyn i ddefnyddiw osod pecynnau heb\n"
 "                   wirio dibyniaethau.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1291,7 +1241,7 @@ msgstr ""
 "  --allow-force  - caniatáu gofyn i ddefnyddiwr osod pecyn heb\n"
 "                   wirio dibyniaethau na'u cyfanrwydd.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1300,22 +1250,22 @@ msgstr ""
 "  --use-distrib  - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n"
 "                   wrth gosod chroot gyda dewis o  --root.\n"
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - defnyddio wget i estyn ffeiliau pell.\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - defnyddio curl i estyn ffeiliau pell.\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - cyfyngu cyflymder y llwytho i lawr.\n"
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1324,7 +1274,7 @@ msgstr ""
 "  --verify-rpm   - gwirio llofnod rpm cyn gosod\n"
 "                   (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig)\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1333,7 +1283,7 @@ msgstr ""
 "  --proxy        - defnyddio'r dirprwy HTTP enwyd, rhif y porth trwy\n"
 "                   rhagosodiad yw 1080 (fformat yw <proxyhost[:port]>).\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1342,7 +1292,7 @@ msgstr ""
 "  --proxy-user   - enwi defnyddiwr a chyfrinair i'w ddefnyddio fel y\n"
 "                   dilysiad dirprw(fformat yw <user:password>).\n"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1351,12 +1301,12 @@ msgstr ""
 "  --bug          - cynhyrchu adroddiad gwall i'r cyfeiriadur nodir gan\n"
 "                   yr arg. nesaf\n"
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - defnyddio rhyngwyneb  X.\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1365,7 +1315,7 @@ msgstr ""
 "  --best-output  - dewiswch y rhyngwyneb gorau yn ôl yr amgylchedd:\n"
 "                   X fodd testun.\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1374,77 +1324,66 @@ msgstr ""
 "  --verify-rpm   - gwirio llofnod rpm cyn gosod\n"
 "                   (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig)\n"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - eithrio llwybr wedi ei wahanu a chollnod.\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - eithrio ffeiliau docs.\n"
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - dewis pob cydweddiad ar y llinell gorchymyn.\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - caniatáu i chwilio ganfod pecyn.\n"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - peidio chwilio yn provides i ganfod pecyn.\n"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - gosod chwilio fuzzy (fel --fuzzy).\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 "  --s          - pecyn nesaf yn becyn ffynhonnell (yr un peth â -src).\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - modd distaw.\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 " bydd enwau neu ffeiliau rpm sy'n cael eu rhoi ar y llinell orchymyn yn cael "
 "eu gosod.\n"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr "Dewis lleoliad i gadw'r ffeil"
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "datganiad dirprwy gwallus ar y llinell orchymyn\n"
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: dewis anhysbys \"-%s\", gwirio defnydd gyda --help\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 "Beth mae modd gwneud gyda ffeiliau deuaidd wrth ddefnyddio --install-src"
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1465,22 +1404,22 @@ msgstr ""
 "\n"
 "Beth hoffech chi ei wneud?"
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "Gwneud dim"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr "Iawn, yn barod i'w osod"
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr "Cadw ffeil"
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1495,12 +1434,12 @@ msgstr ""
 "\n"
 "Efallai byddai'n well gennych eu cadw. Beth yw eich dewis?"
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, c-format
 msgid "Install it"
 msgstr "Ei osod"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1509,42 +1448,42 @@ msgstr ""
 "Mae cyfeiriadur (%s) yn bodoli eisoes, defnyddiwch gyfeiriadur arall am "
 "adroddiad gwall neu ei ddileu."
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Methu creu cyfeiriadur (%s) ar gyfer adroddiad gwall"
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Dim ond uwch ddefnyddiwr sy'n cael gosod pecynnau"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "Mae angen un o'r pecynnau canlynol i osod %s:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Mae angen un o'r pecynnau canlynol:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Beth yw eich dewis? (1-%d)"
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "Gosod pecynnau..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "Cychwyn..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1553,12 +1492,12 @@ msgstr ""
 "Nid oes modd gosod rhai pecynnau gofynwyd amdanynt:\n"
 "%s"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr "cytuno?"
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1569,7 +1508,7 @@ msgstr ""
 "gael eu tynnu i eraill gael eu diweddaru.\n"
 "%s\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1578,15 +1517,15 @@ msgstr ""
 "Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
 "%s"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
 "I fodloni dibyniaethau, bydd y pecynnau canlynol yn cael eu tynnu (%d MB)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1595,37 +1534,47 @@ msgstr ""
 "Rhaid eich bod yn wraidd i osod y dibyniaethau canlynol:\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "methu estyn pecynnau ffynhonnell, atal"
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Rhowch gyfrwng \"%s\" ar ddyfais [%s]"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Pwyso Enter pan yn barod..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Llwytho pecyn '%s'..."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% o %s wedi cwblhau, Cyrraedd = %s, cyflymder = %s"
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% wedi cwblhau, cyflymder = %s"
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Mae gan y pecynnau canlynol lofnod gwallus"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Ydych chi am barhau gosod?"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1636,57 +1585,57 @@ msgstr ""
 "%s\n"
 "Hoffech chi ddiweddaru eich cronfa ddata urpmi?"
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "Methodd y gosod"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr "dosbarthu %s"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr "gosod %s"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Gosod pecyn `%s' (%s/%s)..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Ceisio gosod heb wirio dibyniaethau? (i/N)"
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Gwneud y gosod gyda mwy o orfodaeth (--force)? (i/N)"
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "methodd trosglwyddiad gosod %d"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "Gosod yn bosibl"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "Popeth wedi eu gosod eisoes"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr "ailgychwyn urpmi"
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1711,22 +1660,22 @@ msgstr ""
 "\n"
 "and [options] are from\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update        - defnyddio cyfrwng diweddaru.\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr "  --probe-synthesis - ceisio canfod a defnyddio ffeil synthesis.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr "  --probe-hdlist - ceisio canfod a defnyddio ffeil hdlist.\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
@@ -1735,7 +1684,7 @@ msgstr ""
 "  --no-probe     - peidio ceisio canfod unrhyw synthesis neu\n"
 "                   ffeil hdlist.\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -1744,7 +1693,7 @@ msgstr ""
 "  --distrib      - creu yn awtomatig yr holl gyfrwng o gyfrwng\n"
 "                   gosod\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1756,7 +1705,7 @@ msgstr ""
 "neu\n"
 "                   unrhywwbeth arall sydd wedi ei ffurfweddu ;-)\n"
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1766,7 +1715,7 @@ msgstr ""
 "rhagosodedig yw\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1779,7 +1728,7 @@ msgstr ""
 "pecynnau\n"
 "                   ryddhawyd gan Mandrake.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
@@ -1789,7 +1738,7 @@ msgstr ""
 "o\n"
 "                   osod pecynnau Mandrake.\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
@@ -1798,73 +1747,52 @@ msgstr ""
 "  --virtual      - creu cyfrwng rhithil sydd wedi ei ddiweddaru,\n"
 "                   dom ond protocol ffeil:// sy'n cael ei ganiatau.\n"
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - analluogi gwirio ffeil  MD5SUM.\n"
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - glanhau penawdau yng nghyfeiriadur y storfa.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - gorfodi cynhyrchu ffeiliau hdlist\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"dewisiadau anhysbys '%s'\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "methu ychwanegu diweddariadau o ddosbarthiad cookies\n"
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "adfer drychau yn %s..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"dim angen rhoi <llwybr perthynnol hdlist> gyda --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "dim angen rhoi <llwybr perthynnol hdlist> gyda --distrib"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "methu diweddaru cyfrwng \"%s\"\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"<llwybr perthynnol hdlist> ar goll\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<llwybr perthynnol hdlist> ar goll\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"`with' ar goll ar gyfer cyfrwng rhwydwaith\n"
+msgid "`with' missing for network media\n"
+msgstr "`with' ar goll ar gyfer cyfrwng rhwydwaith\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "methu creu cyfrwng \"%s\"\n"
@@ -1883,6 +1811,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - dewis pob cyfrwng.\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"dewisiadau anhysbys '%s'\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1897,7 +1834,7 @@ msgstr ""
 "mae'r cofnod i'w dynnu ar goll\n"
 "(un o %s)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1906,27 +1843,27 @@ msgstr ""
 "usage: urpmi.update [options] <name> ...\n"
 "lle mai <name> yw'r ewn cyfrwng i'w dynnu.\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr "  --force-key    - gorfodi diweddaru allwedd gpg.\n"
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - dewis pob cyfrwng ansymudadwy.\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "dim i'w ddiweddaru (defnyddio urpmi.addmedia i ychwanegu cyfrwng)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1935,7 +1872,7 @@ msgstr ""
 "mae'r cofnod i ddiweddaru ar goll\n"
 "(un o %s)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1951,22 +1888,22 @@ msgstr ""
 "\n"
 "defnydd:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list        - rhestri'r holl gyfrwng ar gael.\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - rhestri'r holl gyfrwng ar gael.\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - rhestru'r holl gyfrwng ar gael.\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
@@ -1974,18 +1911,18 @@ msgstr ""
 "  --dump-config  - dympio'r ffurfweddiad mewn ffurf ymresymiad urpmi."
 "addmedia.\n"
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 "  --list-nodes   - rhestri'r nodau sydd ar gael wrth ddefnyddio --parallel.\n"
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - rhestr ar gael ar gyfer enwau paralel.\n"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
@@ -1994,14 +1931,14 @@ msgstr ""
 "  --headers      - tynnu penawdau o bechyn yn urpmii db i\n"
 "                   stdout (gwraidd yn unig).\n"
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 "  --sources      - give all source packages before downloading (root only).\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
@@ -2010,17 +1947,17 @@ msgstr ""
 "  --use-distrib  - ffurfweddu urpmi wrth fynd o goeden distrib.\n"
 "                   Mae hyn yn caniatáu ymholi mewn dosbarthiad.\n"
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - cofnod argraffu.\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - ymestyn ymholiad i ddibyniaethau pecynnau.\n"
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -2029,56 +1966,109 @@ msgstr ""
 "  -u             - tynnu pecyn os oes yna fersiwn mwy diweddar wedi ei "
 "osod.\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - allbwn cyfan a phecyn i'w dynnu\n"
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - chwilio nôl  i'r hyn sydd angen ar becyn.\n"
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 "  -i             - argraffu gwybodaeth ddefnyddiol mewn ffordd ddarllenadwy "
 "i bobl.\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g            - argraffu grwpiau gydag enw hefyd.\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - argraffu fersiwn a rhyddhad gydag enw hefyd.\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - rhestri'r ffeiliau mewn pecyn.\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 " bydd enwau neu ffeiliau rpm sy'n cael eu rhoi ar y llinell orchymyn yn cael "
 "eu holi.\n"
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: dewis anhysbys \"-%s\", gwirio defnydd gyda --help\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: methu darllen ffeil rpm \"%s\"\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "dim ond gyda --paralel mae modd defnyddio --list-nodes"
+
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "Webfetch `%s' anhysbys!!!\n"
+
+#~ msgid "copy failed: %s"
+#~ msgstr "methodd y copïo: %s"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "wget ar goll\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "methodd wget: gadael gyda%d neu signal %d\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "curl ar goll\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "methodd curl: gadael gyda %d neu signal %d\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "rysnc ar goll\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "methodd rsync:gadael gyda %d neu signal %d\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "ssh ar goll\n"
+
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpme: dewis anhysbys \"-%s\", gwirio defnydd gyda --help\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmi: dewis anhysbys \"-%s\", gwirio defnydd gyda --help\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr ""
+#~ "I fodloni dibyniaethau, bydd y pecynnau canlynol yn cael eu tynnu (%d MB)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "dim angen rhoi <llwybr perthynnol hdlist> gyda --distrib"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "<llwybr perthynnol hdlist> ar goll\n"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "`with' ar goll ar gyfer cyfrwng rhwydwaith\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmq: dewis anhysbys \"-%s\", gwirio defnydd gyda --help\n"
diff --git a/po/da.po b/po/da.po
index 58335ae4..30571fa6 100644
--- a/po/da.po
+++ b/po/da.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-da\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2004-03-06 09:28+0100\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Danish <<dansk@klid.dk>>\n"
@@ -56,22 +56,22 @@ msgstr ""
 "Automatisk installation af pakker...\n"
 "Du bestilte installation af pakke %s\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "Er det o.k.?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "O.k."
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Annullér"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (J/n) "
@@ -81,7 +81,7 @@ msgstr " (J/n) "
 msgid "%s: command not found\n"
 msgstr "%s: kommando ikke fundet\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
@@ -90,113 +90,52 @@ msgstr ""
 "brug: %s [tilvalg]\n"
 "hvor [tilvalg] er fra\n"
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - udskriv denne hjælpebesked.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "  -g [group}     - begræns resultater til denne gruppe.\n"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, c-format
 msgid "                    defaults is %s.\n"
 msgstr "                    standard er %s.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Ukendt webfetch `%s' !!!\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "ukendt protokol defineret for %s"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "Ingen webhentning fundet, understøttede webhentninger er: %s\n"
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "kunne ikke behandle protokol: %s"
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "kopiering mislykkedes: %s"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "'wget' mangler\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget mislykkedes: afsluttede med %d eller signal %d\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "'curl' mangler\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "'curl' mislykkedes: afsluttede med %d eller signal %d\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "'rsync' mangler\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "'rsync' mislykkedes: afsluttede med %d eller signal %d\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "'ssh' mangler\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% af %s færdige, resterer = %s, hastighed = %s"
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% færdig, hastighed = %s"
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...hentning mislykkedes: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "syntaksfejl i config fil ved linje %s"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr "medie \"%s\" prøver at bruge en allerede brugt hdlist, medie ignoreret"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr "medie \"%s\" prøver at bruge en allerede brugt liste, medie ignoreret"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -205,39 +144,39 @@ msgstr ""
 "kan ikke behandle medie \"%s\" da listefil allerede bliver brugt af et andet "
 "medie"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 "Kunne ikke bruge navnet '%s' for navnløst medium fordi det allerede er brugt"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 "kunne ikke tage medie \"%s\" i beregning da ingen listefil [%s] eksisterer"
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "kunne ikke bestemme medie for denne hdlist-fil [%s]"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "kunne ikke nå hdlist-fil af \"%s\", medie ignoreret"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "kan ikke få adgang til filen \"%s\", medie ignoreret"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "prøver at forbigå eksisterende medie \"%s\", undgår"
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -246,92 +185,92 @@ msgstr ""
 "det virtuelle medie \"%s\" bør ikke have defineret en hdlist- eller list-"
 "fil, medie ignoreret"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "virtuelt medie \"%s\" bør have en klar url, medie ignoreret"
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "kunne ikke finde hdlist-fil for \"%s\", medie ignoreret"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "kunne ikke finde listefil for \"%s\", medie ignoreret"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "inkonsistent listefil for \"%s\", medie ignoreret"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "kunne ikke inspicere listefil for \"%s\", medie ignoreret"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "For mange monteringspunkter for udskifteligt medium \"%s\""
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "tager udskifteligt medium som \"%s\""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "bruger en anden udskiftelig enhed [%s] for \"%s\""
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "kan ikke finde stinavn for udskifteligt medie \"%s\""
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "kunne ikke skrive config-fil [%s]"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "skriver config fil [%s]"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "Kan ikke bruge parallel-tilstand med 'use-distrib '-tilstand"
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "kunne ikke tolke '%s' i fil [%s]"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "undersøger parallelbehandling i fil [%s]"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "fandt parallelbehandling for knuder: %s"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "bruger tilknyttet medie for parallel tilstand: %s"
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "kan ikke bruge parallel mulighed \"%s\""
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -340,90 +279,90 @@ msgstr ""
 "--synthesis kan ikke bruges med --media, --excludemedia, --sortmedia, --"
 "update eller --parallel"
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "undersøger syntese-fil [%s]"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "undersøger hdlist-fil [%s]"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "virtuelt medie \"%s\" er ikke lokalt, medie ignoreret"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "problem ved læsning af hdlist- eller syntese-fil for medie \"%s\""
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "udfører andet gennemløb for at beregne afhængigheder\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "overspringer pakke %s"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "ville installere i stedet for at opgradere pakke %s"
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "kunne ikke åbne rpmdb"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "medie \"%s\" eksisterer allerede"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr "virtuelt medie skal være lokalt"
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "tilføjede medie %s"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "kan ikke få adgang til første installationsmedium"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "kopierer hdlists-fil..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "...kopiering mislykkedes"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "...kopiering færdig"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
@@ -432,43 +371,49 @@ msgstr ""
 "kunne ikke få fat på det første installationsmedium (ingen Mandrake/base/"
 "hdlists fil fundet)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "henter hdlists-fil..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "...hentning færdig"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...hentning mislykkedes: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "ugyldig hdlist beskrivelse '%s' i hdlists-fil"
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "prøver at vælge ikke-eksisterende medie \"%s\""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "vælger flere medier: %s"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "fjerner medium \"%s\""
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -478,7 +423,7 @@ msgstr ""
 "Kan ikke tilgå medie '%s',\n"
 "dette kan ske hvis du manuelt monterede kataloget ved oprettelsen af mediet."
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -487,222 +432,222 @@ msgstr ""
 "virtuelt medie \"%s\" burde have gyldig kilde-hdlist eller -syntese, medie "
 "ignoreret"
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "kopierer beskrivelsesfil for \"%s\"..."
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "beregner md5sum på eksisterende kilde-hdlist (eller -syntese)"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "undersøger MD5SUM-fil"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "kopierer kilde-hdlist (eller -syntese) for \"%s\"..."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "kopiering af [%s] mislykkedes (filen er mistænkeligt lille)"
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "beregner md5sum på kopieret kilde-hdlist (eller -syntese)"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "kopi af [%s] mislykkedes (md5sum-uoverensstemmelse)"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "problem ved læsning af syntese-fil for medie \"%s\""
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "læser rpm-filer fra [%s]"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "kunne ikke læse rpm-filer fra  [%s]: %s"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "ingen rpm filer fundet fra [%s]"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "henter kilde-hdlist (eller -syntese) for \"%s\"..."
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "fandt undersøgte hdlist (eller syntese) for \"%s\"..."
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "beregner md5sum på hentet kilde-hdlist (eller -syntese)"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr "md5sum: passer ikke"
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "hentning af kilde-hdlist (eller -syntese) mislykkedes"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "ingen hdlist-fil fundet for medie \"%s\""
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "fil [%s] er allerede brugt på det samme medie \"%s\""
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "kunne ikke fortolke hdlist-filen \"%s\""
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "kunne ikke skrive listefil for \"%s\""
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "skriver liste-fil for medie \"%s\""
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "ingenting skrevet i listefil for \"%s\""
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "undersøger pubkey-fil for '%s'"
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...importeret nøgle %s fra pubkey-fil for \"%s\""
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "kunne ikke importere pubkey-fil for \"%s\""
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "læser hoveder fra medium \"%s\""
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "bygger hdlist [%s]"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "byggede hdlist syntese fil for medie \"%s\""
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "fandt %d hoveder i hurtiglager"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "fjerner %d forældede hoveder i hurtiglager"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "monterer %s"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "afmonterer %s"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "omflyttede %s indgange i depsliste"
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "ingen indgange omflyttede i depsliste"
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "ugyldigt rpm-filnavn [%s]"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "henter rpm-fil [%s]..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "kunne ikke nå rpm fil [%s]"
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "kunne ikke registrere rpm-fil"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "fejl ved registrering af lokale pakker"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "ingen pakke kaldet %s"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Følgende pakker indeholder %s: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "der er flere pakker med samme rpm-filnavn \"%s\""
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "kunne ikke fortolke [%s] korrekt ved værdi \"%s\""
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -711,62 +656,62 @@ msgstr ""
 "medie \"%s\" bruger en ugyldig listefil:\n"
 "  spejlet er nok ikke opdateret, prøver at bruge en anden metode"
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "medie \"%s\" definerer ikke noget sted for rpm-filer"
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "pakke %s er ikke fundet."
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi-database låst"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "medie \"%s\" er ikke valgt"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "kunne ikke læse rpm-fil [%s] fra medie \"%s\""
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "inkonsistent medie \"%s\" mærket udskifteligt, men er det ikke"
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "kunne ikke nå medie \"%s\""
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "misdannet inddata: [%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "henter rpm-filer fra medie '%s'..."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "Forbereder..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "bruger proces %d for at udføre transaktion"
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -774,82 +719,97 @@ msgstr ""
 "oprettede transaktion for installering på %s (fjern=%d, installér=%d, "
 "opgradér=%d)"
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr "kan ikke oprette transaktion"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "fjerner pakke %s"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "kan ikke fjerne pakke %s"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "tilføjer pakke %s (id=%d, eid=%d, opdatering=%d, fil=%s)"
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "kunne ikke installere pakke %s"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "grundet manglende %s"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "grundet uopfyldt %s"
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr "prøver at fremme %s"
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr "for at kunne beholde %s"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "for at kunne installere %s"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "grundet modstrid med %s"
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr "ikke ønsket"
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Ugyldig signatur (%s)"
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "Ugyldig nøgle-id (%s)"
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Manglende signatur (%s)"
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "Forkert proxy-erklæring på kommandolinje\n"
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: kan ikke læse rpm-fil \"%s\"\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Undskyld, dårligt valg, prøv igen\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -865,41 +825,41 @@ msgstr ""
 "\n"
 "brug:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - udskriv denne hjælpebesked.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - vælg automatisk en pakke ved valg.\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr "  --test         - afprøv om installationen kan udføres korrekt.\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 "  --force        - gennemfør kald selv om nogen pakker ikke eksisterer.\n"
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - distribueret urpmi over maskiner med alias.\n"
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - brug en anden root for rpm-installation.\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -908,74 +868,64 @@ msgstr ""
 "  --use-distrib  - konfigurér urpmi løbende fra et distrib træ, "
 "nyttigt               til at (af)installere en chroot med root-tilvalget.\n"
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - udførlig tilstand.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - vælg alle pakker matchende udtryk.\n"
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: ukendt parameter \"-%s\", tjek brug med --help\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr "ukendte pakker"
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "ukendt pakke"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "fjernelse af pakke %s vil skade dit system"
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr "Ingenting at fjerne"
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "Tjekker for at fjerne de følgende pakker"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
 "For at tilfredsstille afhængigheder vil de følgende pakker blive fjernet (%d "
 "Mb)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (j/N) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "fjerner %s"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr "Fjernelse mislykkedes"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Undskyld, dårligt valg, prøv igen\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -991,39 +941,39 @@ msgstr ""
 "\n"
 "brug:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - brug kun opdateringsmedie.\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - brug kun de opgivne medier, adskilt med komma.\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - brug ikke de opgivne medier, adskilt med komma.\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 "  --sortmedia    - sortér medier ifølge delstrenge, adskilt med komma.\n"
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr "  --synthesis    - brug synthesis angivet i stedet for urpmi-db.\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  -v             - udførlig tilstand.\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1034,140 +984,140 @@ msgstr ""
 "på\n"
 "                    kommandolinjen, inkompatibel med interaktiv tilstand).\n"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --uniq          - udskriv ikke identiske linjer.\n"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all           - skriv alle mærker.\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group         - skriv mærkegruppe: gruppe.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size          - skriv mærke-størrelse: størrelse.\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --size          - skriv mærke-størrelse: størrelse.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary       - skriv mærke-resumé: resumé.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description   - skriv mærke-beskrivelse: beskrivelse.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr "  --sourcerpm     - skriv mærke for kilde-rpm: kilde-rpm.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr "  --packager      - skriv mærke-pakker: pakker.\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr "  --buildhost     - skriv mærke-byggevært: byggevært.\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --url           - skriv mærke-url: url.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr "  --provides      - skriv mærke-tilbud: alle tilbud.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr "  --requires      - skriv mærke-krav: alle krav.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files         - skriv mærke-filer: alle filer.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr "  --conflicts     - skriv mærke-konflikter: alle konflikter.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr "  --obsoletes     - skriv mærke-forældede: alle forældede.\n"
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
 msgstr "  --env          - brug specifikt miljø (typisk ved en fejlrapport).\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
 "  -i             - ignorér forskel på store og små bogstaver i alle "
 "mønstre.\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - udskriv version, udgave og arkitektur med navn.\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - inkludér perl-kode direkte som perl -e.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 "  -a             - binær OG-operator, sand hvis begge udtryk er sande.\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 "  -o             - binær ELLER-operator, sand hvis et udtryk er sandt.\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - negation, sand hvis udtryk er falsk.\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr "  (              - venstreparantes for at åbne gruppeudtryk.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr "  (              - højreparantes for at lukke gruppeudtryk.\n"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
@@ -1176,12 +1126,12 @@ msgstr ""
 "tilbagekald er :\n"
 "%s\n"
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "bruger særligt miljø på %s\n"
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1197,19 +1147,19 @@ msgstr ""
 "\n"
 "brug:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - brug synthesis angivet i stedet for urpmi-db.\n"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 "  --auto-select  - vælg automatisk pakker for opgradering af systemet.\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
@@ -1218,7 +1168,7 @@ msgstr ""
 "  --no-uninstall - spørg aldirig om afinstallering af en pakke, afbryd "
 "installationen.\n"
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1227,7 +1177,7 @@ msgstr ""
 "  --keep         - behold eksisterende pakker om muligt, afvis anmodede\n"
 "                   pakker som fører til fjernelse.\n"
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1238,37 +1188,37 @@ msgstr ""
 "                       skal installeres eller opgraderes,\n"
 "                       standard er %d.\n"
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - lille tansaktionslængde, standard er %d.\n"
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - gennemfør søgning efter fuzzy (samme som -y).\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - næste pakke er en kildepakke (samme som -s).\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - installér kun kildepakker (ingen binære).\n"
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - fjern rpm fra cache før noget andet.\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - behold rpm ikke brugt i cache.\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1278,7 +1228,7 @@ msgstr ""
 "kontrol af\n"
 "                   afhængigheder.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1287,7 +1237,7 @@ msgstr ""
 "  --allow-force  - tillad at spørge bruger om installering af pakker\n"
 "                   uden kontrol af afhængigheder og integritet.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1296,22 +1246,22 @@ msgstr ""
 "  --use-distrib  - konfigurér urpmi løbende fra et distrib-træ, "
 "nyttigt               til at installere en chroot med --root-tilvalget.\n"
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - brug wget til at hente eksterne filer.\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - brug 'curl' til at hente retrieve eksterne filer.\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - begræns hastighed på hentning.\n"
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1320,7 +1270,7 @@ msgstr ""
 " --resume       - genoptag overførsel af delvist hentede filer\n"
 "                   (--no-resume deaktiverer det, standard er deaktiveret).\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1329,7 +1279,7 @@ msgstr ""
 "  --proxy        - brug den angivne HTTP proxy, portnummeret antages at\n"
 "                   være 1080 som standard (formatet er <proxyvært[:port]>).\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1338,7 +1288,7 @@ msgstr ""
 "  --proxy-user   - angiv bruger og adgangskode til brug for kontrol\n"
 "                   af proxy (formatet er <bruger:adgangskode>).\n"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1347,12 +1297,12 @@ msgstr ""
 "  --bug          - udskriv en fejlrapport i et katalog angivet i næste\n"
 "                   argument.\n"
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - brug X-grænsesnit.\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1361,7 +1311,7 @@ msgstr ""
 "  --best-output  - vælg bedste grænsesnit svarende til miljøet:\n"
 "                   X- eller tekst-udgave.\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1371,74 +1321,63 @@ msgstr ""
 "                   (--no-verify-rpm deaktiverer det, standard er "
 "aktiveret).\n"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - udelukkelsessti adskilt med komma.\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - udelader docs-filer.\n"
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - vælg alle træffere på kommandolinje.\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - tillad søgning i 'provides' for at finde pakke.\n"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - søg ikke i 'provides' for at finde pakke.\n"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - gennemfør upræcis søgning (samme som --fuzzy).\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s             - næste pakke er en kildepakke (samme som --src).\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - stille udgave.\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 "  navne eller rpm-filer givne på kommandolinjen vil blive installeret.\n"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr "Vælg sted at gemme filen"
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "Forkert proxy-erklæring på kommandolinje\n"
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: ukendt parameter \"-%s\", tjek brug med --help\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr "Hvad der kan gøres med binære rpm-filer ved brug af --install-src"
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1460,22 +1399,22 @@ msgstr ""
 "\n"
 "Hvad ønsker du at gøre?"
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "Gør ingenting"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr "Ja, installér det virkelig"
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr "Gem fil"
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1490,12 +1429,12 @@ msgstr ""
 "\n"
 "Du vil måske foretrække blot at gemme den. Hvad er dit valg?"
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, c-format
 msgid "Install it"
 msgstr "Installér den"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1504,42 +1443,42 @@ msgstr ""
 "Kataloget [%s] eksisterer allerede, brug venligst et andet katalog til "
 "fejlrapporten, eller slet det"
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "kunne ikke oprette katalog [%s] til fejlrapport"
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Kun superbrugeren har lov til at installere pakker"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "Der er brug for en af de følgende pakker for at installere %s:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Der er brug for en af de følgende pakker:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Hvad er dit valg? (1-%d) "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "Pakkeinstallation..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "Initialiserer..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1548,12 +1487,12 @@ msgstr ""
 "Nogen forespurgte pakker kan ikke installeres:\n"
 "%s"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr "Er du enig?"
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1564,7 +1503,7 @@ msgstr ""
 "skal fjernes for at andre kan opgraderes:\n"
 "%s\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1573,16 +1512,16 @@ msgstr ""
 "De følgende pakker skal fjernes for at andre kan opgraderes:\n"
 "%s"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
 "For at tilfredsstille afhængigheder vil de følgende pakker blive installeret "
 "(%d Mb)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1591,37 +1530,47 @@ msgstr ""
 "Du skal være root for at installere de følgende afhængigheder:\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "kan ikke hente kilde-pakker, afslutter med fejl"
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Vær venlig at indsætte mediet med navnet %s i enhed [%s]"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Tryk på retur, når den er klar..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Henter pakke %s..."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% af %s færdige, resterer = %s, hastighed = %s"
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% færdig, hastighed = %s"
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "De følgende pakker har dårlige signaturer"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Ønsker du at fortsætte installationen?"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1632,57 +1581,57 @@ msgstr ""
 "%s\n"
 "Du ønsker måske at opdatere din urpmi-database"
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "Installationen fejlede"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr "distribuerer %s"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr "installerer %s"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Installerer pakke `%s' (%s/%s)..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Prøv installation uden at tjekke afhængigheder? (j/N) "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Prøv installation med endnu større kraft (--force)? (j/N) "
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d installationstrasaktioner mislykkedes"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "Installation er mulig"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "alting er allerede installeret"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr "genstarter urpmi"
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1707,23 +1656,23 @@ msgstr ""
 "\n"
 "og [valgmuligheder] er følgende\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - opret et opdateringsmedium.\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
 "  --probe-synthesis forsøg at finde og bruge syntese- eller hdlist-fil.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr "  --probe-hdlists - forsøg at finde og bruge hdlist-fil.\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
@@ -1731,7 +1680,7 @@ msgid ""
 msgstr ""
 "  --no-probe     - forsøg ikke at finde og bruge syntese- eller hdlist-fil.\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -1739,7 +1688,7 @@ msgid ""
 msgstr ""
 "  --distrib      - opret automatisk alle media fra et installationsmedium.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1750,7 +1699,7 @@ msgstr ""
 "                   distribution, XXX kan være main, contrib, updates eller\n"
 "                   alt andet der er blevet konfigureret;-)\n"
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1759,7 +1708,7 @@ msgstr ""
 "  --from         - brug angivet adresse for liste over spejl, standard er\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1770,7 +1719,7 @@ msgstr ""
 "                   versionen af distributionen indikeret ved den\n"
 "                   installerede mandrake-release pakke.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
@@ -1779,7 +1728,7 @@ msgstr ""
 "  --arch         - brug angivet arkitektur, standard er arkitekturen af\n"
 "                   mandrake-release pakken installeret.\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
@@ -1788,73 +1737,52 @@ msgstr ""
 "  --virtual       - opret virtuelt medie som altid er opdatere,\n"
 "                     kun protokollen file:// er tilladt.\n"
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - deaktivér kontrol med MD5SUM fil.\n"
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - rydder katalog med cache for headere.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - gennemfør generering af hdlist-filer.\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"ukendte valg '%s'\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "kan ikke tilføje opdateringer af en cooker-distribution\n"
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "henter spejle på %s ..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"ingen grund til at angive <relativ sti for hdlist> med --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "ingen grund til at angive <relativ sti for hdlist> med --distrib"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "kan ikke opdatere medie \"%s\"\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"<relativ sti for hdlist> mangler\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<relativ sti for hdlist> mangler\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"'with' mangler for netværks-medie\n"
+msgid "`with' missing for network media\n"
+msgstr "'with' mangler for netværks-medie\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "kan ikke oprette medie \"%s\"\n"
@@ -1873,6 +1801,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - vælg alle medier.\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"ukendte valg '%s'\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1887,7 +1824,7 @@ msgstr ""
 "mangler det element der skal fjernes\n"
 "(én af %s)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1896,27 +1833,27 @@ msgstr ""
 "brug: urpmi.update [valgmuligheder] <navn> ...\n"
 "hvor <navn> er et medie-navn der skal opdateres.\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - opdatér kun opdateringsmedie.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr "  --force-key    - gennemtving opdatering af gpg-nøgle.\n"
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - vælg alle ikke-udskiftelige medier.\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "ingenting at opdatere (brug urpmi.addmedia til at tilføje et medie)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1925,7 +1862,7 @@ msgstr ""
 "mangler det element der skal opdateres\n"
 "(én af %s)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1941,22 +1878,22 @@ msgstr ""
 "\n"
 "brug:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list          - skriv tilgængelige pakker.\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - list tilgængelige medier.\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - list tilgængelige medier og deres url.\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
@@ -1964,17 +1901,17 @@ msgstr ""
 "  --dump-config  - udskriv konfigurationen i form af urpmi.addmedia "
 "argumenter.\n"
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr "  --list-nodes   - list tilgængelige knuder ved brug af --parallel.\n"
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - list tilgængelige parallelle aliaser.\n"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
@@ -1983,13 +1920,13 @@ msgstr ""
 "  --headers      - udtræk headere for pakke listet fra urpmi-db til\n"
 "                   stdud (kun root).\n"
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr "  --sources      - giv alle kildepakker før hentning (kun root).\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
@@ -1998,17 +1935,17 @@ msgstr ""
 "  --use-distrib  - konfigurér urpmi løbende fra et distrib-træ.\n"
 "              Dette muliggør at spørge efter en distro.\n"
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - udskriv ændringslog.\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - udvid forespørgsel til pakkeafhængigheder.\n"
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -2017,56 +1954,110 @@ msgstr ""
 "  -u             - fjern pakke hvis en nyere version allerede er "
 "installeret.\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - færdiggør uddata med pakke der skal fjernes.\n"
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - omvendt søgning til hvad der kræver pakke.\n"
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -i             - udskriv nyttig information på læsevenlig form.\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - udskriv også grupper med navn.\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - udskriv også version og udgave med navn.\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l..          - udskriv filer i pakken.\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  navne eller rpm-filer givne på kommandolinjen bliver forespurgt.\n"
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: ukendt parameter \"-%s\", tjek brug med --help\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: kan ikke læse rpm-fil \"%s\"\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes kan kun bruges med --parallel"
 
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "Ukendt webfetch `%s' !!!\n"
+
+#~ msgid "copy failed: %s"
+#~ msgstr "kopiering mislykkedes: %s"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "'wget' mangler\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "wget mislykkedes: afsluttede med %d eller signal %d\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "'curl' mangler\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "'curl' mislykkedes: afsluttede med %d eller signal %d\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "'rsync' mangler\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "'rsync' mislykkedes: afsluttede med %d eller signal %d\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "'ssh' mangler\n"
+
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpme: ukendt parameter \"-%s\", tjek brug med --help\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmi: ukendt parameter \"-%s\", tjek brug med --help\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr ""
+#~ "For at tilfredsstille afhængigheder vil de følgende pakker blive "
+#~ "installeret (%d Mb)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "ingen grund til at angive <relativ sti for hdlist> med --distrib"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "<relativ sti for hdlist> mangler\n"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "'with' mangler for netværks-medie\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmq: ukendt parameter \"-%s\", tjek brug med --help\n"
+
 #~ msgid "no webfetch (curl or wget currently) found\n"
 #~ msgstr ""
 #~ "intet webhentningprogram (for øjeblikket 'curl' eller 'wget') fundet\n"
diff --git a/po/de.po b/po/de.po
index 90a5c070..0336840f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2003-07-28 23:40+0200\n"
 "Last-Translator: Stefan Siegel <siegel@linux-mandrake.com>\n"
 "Language-Team: German <cooker-i18n@linux-mandrake.com>\n"
@@ -53,22 +53,22 @@ msgstr ""
 "Automatische Installation von Paketen ...\n"
 "Sie wünschen die Installation von Paket „%s“\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "Ist das in Ordnung?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Abbruch"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (J/n) "
@@ -78,124 +78,63 @@ msgstr " (J/n) "
 msgid "%s: command not found\n"
 msgstr "%s: Befehl nicht gefunden\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "where [options] are from\n"
 msgstr ""
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - Diese Hilfe-Botschaft anzeigen.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, fuzzy, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "  --group         - Ausgabe des Attributs „Gruppe“."
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, fuzzy, c-format
 msgid "                    defaults is %s.\n"
 msgstr "  --list          - Alle verfügbaren Pakete auflisten.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Unbekanntes Programm „%s“ zum Herunterladen der Pakete!!!\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "Unbekanntes Protokoll für %s"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "Ich kann mit dem Prtokoll „%s“ nicht umgehen."
 
-#: ../urpm.pm:189
-#, fuzzy, c-format
-msgid "copy failed: %s"
-msgstr "... das Kopieren schlug fehl!"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "wget fehlt\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget-Fehler: Beendet mit Rückgabewert '%d' oder Signal '%d'\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "curl fehlt\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl-Fehler: Beendet mit Rückgabewert %d oder Signal %d\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "rsync fehlt\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "rsync-Fehler: Beendet mit Rückgabewert %d oder Signal %d\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "ssh fehlt\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr ""
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr ""
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...Holen fehlgeschlagen: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "Syntax-Fehler in Konfigurationsdatei auf Linie %s"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 "Das Medium „%s“ versucht eine bereits verwendete HD-Liste ebenfalls zu "
 "verwenden, es wird daher ignoriert."
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 "Das Medium „%s“ versucht eine bereits verwendete Liste ebenfalls zu "
 "verwenden, es wird daher ignoriert."
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -204,43 +143,43 @@ msgstr ""
 "Das Medium „%s“ kann nicht verwendet werden, da die Dateiliste bereits von "
 "einem anderen Medium verwendet wird."
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 "Sie können „%s“ nicht als Name für dieses Medium verwenden, da er bereits "
 "verwendet wird."
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 "Es ist nicht möglich, das Medium „%s“ zu verwenden, da keine Dateilise [%s] "
 "existiert."
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "Konnte Medium dieser HD-Liste nicht bestimmen [%s]"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 "Es ist nicht möglich, auf die HD-Liste „%s“ zuzugreifen,\n"
 "das Medium wird daher ignoriert."
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "Konnte nicht auf Listendatei von „%s“ zugreifen, Medium ignoriert"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "Versuche existierendes Medium „%s“ zu umgehen, vermeidend"
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, fuzzy, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -249,97 +188,97 @@ msgstr ""
 "Das virtuelle Medium „%s“ sollte weder eine HD-Liste noch eine Dateiliste "
 "angeben, es wird daher ignoriert."
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, fuzzy, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr ""
 "Das Medium „%s“ versucht eine bereits verwendete Liste ebenfalls zu "
 "verwenden, es wird daher ignoriert."
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 "Die HD-Liste für das Medium „%s“ wurde nicht gefunden, es wird ignoriert."
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 "Die Dateiliste für das Medium „%s“ wurde nicht gefunden, es wird ignoriert."
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "Die Dateiliste für „%s“ ist inkonsistent, das Medium wird ignoriert."
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
 "Die Dateiliste für „%s“ kann nicht kontrolliert werden, es wird ignoriert."
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "Es existieren zu viele Einhängpunkte für das Wechselmedium „%s“"
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "Verwende Wechselmedium als „%s“"
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "Verwendung verschiedener Wechselmedien [%s] für „%s“"
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "Ich kann den Pfadnamen für das Wechselmedium „%s“ nicht finden."
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "Die Konfigurationsdatei [%s] kann nicht geschrieben werden."
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "Schreiben der Konfigurationsdatei [%s]."
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "Ich kann „%s“ in Datei [%s] nicht parsen."
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "Prüfen der Parallel-Handler in Datei [%s]"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "Parallel-Handler für folgende Knoten gefunden: %s"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, fuzzy, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "Verwende assoziiertes Medium für den parallelen Modeus: %s"
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "Ich kann die Parallel-Option „%s“ nicht nutzen."
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, fuzzy, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -348,92 +287,92 @@ msgstr ""
 "„--synthesis“ kann nicht mit „--media“, „--update“ oder „--parallel“ "
 "verwendet werden."
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "Lesen der Synthese-Datei [%s]"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "Prüfen der HD-Liste [%s]"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, fuzzy, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr ""
 "Das Medium „%s“ versucht eine bereits verwendete Liste ebenfalls zu "
 "verwenden, es wird daher ignoriert."
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "Probleme beim Lesen der HD-Liste oder Synthese-Datei des Mediums „%s“"
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "Zweiter Durchlauf zum Berechnen der Paketabhängigkeiten\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "Paket %s augelassen"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, fuzzy, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "Ich kann das Paket „%s“ nicht entfernen."
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "Ich kann deie RPM-Datei kann nicht öffnen."
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "Das Medium „%s“ existiert bereits."
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr ""
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "Medium %s hinzugefügt"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "Es kann nicht auf das erste Installationsmedium zugegriffen werden."
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "Lesen der HD-Liste ..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, fuzzy, c-format
 msgid "...copying failed"
 msgstr "... das Kopieren ist beendet!"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "... das Kopieren ist beendet!"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
@@ -442,43 +381,49 @@ msgstr ""
 "Kein Zugriff auf das erste Installationsmedium (die Datei „Mandrake/base/"
 "hdlists“ wurde nicht gefunden)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "Holen der HD-Liste ..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "...Holen fertig"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...Holen fehlgeschlagen: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "Fehlerhafte HD-Liste in Datei „%s“"
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, fuzzy, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "Versuch, das nicht existierende Medium „%s“ auszuwählen."
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "Auswahl des Mehrfachmediums: %s"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "„%s“"
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "Entfernen des Mediums „%s“."
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -486,7 +431,7 @@ msgid ""
 "medium."
 msgstr ""
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, fuzzy, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -495,365 +440,380 @@ msgstr ""
 "Das Medium „%s“ versucht eine bereits verwendete HD-Liste ebenfalls zu "
 "verwenden, es wird daher ignoriert."
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "Kopiere Beschreibungs-Datei von „%s“..."
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, fuzzy, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "Kopiere HD-Liste (oder synthesis-Datei) von „%s“ ..."
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "Prüfen der MD5-Summe"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "Kopiere HD-Liste (oder synthesis-Datei) von „%s“ ..."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, fuzzy, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "Wget von [%s] schlug fehl (ist wget installiert?)"
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "Berechnen der md5-Summe der kopieren HD-Liste (oder synthesis-Datei)"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, fuzzy, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "Kopieren von [%s] schlug fehl."
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "Probleme beim Lesen der Synthese-Datei des Mediums „%s“"
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "Lesen der RPM-Dateien von [%s]"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "Ich kann die RPM-Dateien von [%s] nicht lesen: %s"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "Keine rpm-Dateien in [%s] gefunden"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "Hole HD-Liste (oder synthesis-Datei) von „%s“..."
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "HD-Liste (oder synthesis-Datei) als „%s“ gefunden"
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "Holen der HD-Liste (oder synthesis-Datei) fehlgeschlagen"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr ""
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "Holen der HD-Liste (oder synthesis-Datei) fehlgeschlagen"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "Keine HD-Liste für das Medium „%s“ gefunden."
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "Datei [%s] wird bereits im selben Medium „%s“ verwendet."
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "Die Struktur der HD-Liste von „%s“ ist nicht korrekt."
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "Ich kann die Dateiliste für „%s“ nicht schreiben."
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, fuzzy, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "Keine HD-Liste für das Medium „%s“ gefunden."
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "Es wurde nichts in die Dateiliste von „%s“ geschrieben."
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, fuzzy, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "Holen der Beschreibungsdatei für „%s“ ..."
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, fuzzy, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "Ich kann die Dateiliste für „%s“ nicht schreiben."
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, fuzzy, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "Ich kann die Dateiliste für „%s“ nicht schreiben."
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "Lesen der Paketinformationen des Mediums „%s“."
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "Erstellen der HD-Liste [%s]."
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "Erstellen der HD-Liste für das Medium „%s“"
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "%d Informationen im Cache gefunden."
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "Entferne %d veraltete Informationen aus dem Cache."
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "Einhängen von „%s“"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "Aushängen von „%s“"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "Verschiebe %s Einträge in Depslist-Datei"
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "keine Einträge in depslist-Datei verschoben"
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "Ungültiger RPM Name [%s]."
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "Holen des RPMs [%s]..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "Ich habe keinen Zugriff auf die RPM-Datei [%s]."
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "Ich kann die RPM-Datei nicht registrieren."
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "Fehler bei der Registrierung lokaler Pakete"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "Kein Paket namens %s"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Die folgenden Pakete enthalten „%s“: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "Es existieren mehrere Pakete mit dem selben RPM-Dateinamen „%s“"
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "Konnte [%s] beim Wert „%s“ nicht korrekt analysieren."
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
 "  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr ""
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "Paket %s wurde nicht gefunden."
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "Die urpmi-Datenbank wird von einem anderen Prozess blockiert!"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "Das Medium „%s“ wurde nicht ausgewählt."
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "Ich kann das RPM-Paket „%s“ von Medium „%s“ nicht lesen."
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "„%s“ wurde als Wechselmedium angegeben, ist es aber nicht."
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "Ich kann auf das Medium „%s“ nicht zugreifen."
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "Inkorrekte Eingabe: [%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, fuzzy, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "Holen der RPMs ..."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "Vorbereiten ..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr ""
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, fuzzy, c-format
 msgid "unable to create transaction"
 msgstr "Ich kann das Medium „%s“ nicht anlegen.\n"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "Entfernen des Pakets „%s“"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "Ich kann das Paket „%s“ nicht entfernen."
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr ""
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "Ich kann das Paket „%s“ nicht installeren."
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, fuzzy, c-format
 msgid "due to missing %s"
 msgstr "wget fehlt\n"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, fuzzy, c-format
 msgid "trying to promote %s"
 msgstr "Ich versuche %s durch Auswahl von %s bereitzustellen."
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, fuzzy, c-format
 msgid "in order to keep %s"
 msgstr "Ich kann das Paket „%s“ nicht installeren."
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, fuzzy, c-format
 msgid "in order to install %s"
 msgstr "Ich kann das Paket „%s“ nicht installeren."
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "wegen Konflikten mit %s"
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr "Unangefordert"
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Falsche Signatur (%s)"
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr ""
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr ""
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "Ungültige Proxyangabe als Kommandozeilenparameter\n"
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: Ich kann das RPM „%s“ nicht lesen.\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Eine schlechte Wahl, versuchen Sie es erneut\n"
+
+#: ../urpme:36
 #, fuzzy, c-format
 msgid ""
 "urpme version %s\n"
@@ -870,25 +830,25 @@ msgstr ""
 "\n"
 "Verwendung:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - Diese Hilfe-Botschaft anzeigen.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - Automatische Auswahl bei mehren Möglichkeiten.\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 "  --test         - Versuch, ob die Installation korrekt verlaufen wird.\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
@@ -896,95 +856,85 @@ msgstr ""
 "  --force        - Erzwinge Aufruf, sogar wenn einige Pakete nicht "
 "existieren.\n"
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 " --parallel     - verteilter urpmi Aufru auf allen teilnehmenden\n"
 "                  Maschinen.\n"
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, fuzzy, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --curl         - Benutze curl um entfernte Dateien zu laden.\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - ausführlicher Modus.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, fuzzy, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 "  -a             - Wähle alle Treffer in der Kommandozeile.\n"
 "\n"
 
-#: ../urpme:68
-#, fuzzy, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: unbekannte Option „-%s“. Bitte Hilfe mit --help nachschlagen\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, fuzzy, c-format
 msgid "unknown packages"
 msgstr "unbekannte Pakete "
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "unbekanntes Paket"
 
-#: ../urpme:101
+#: ../urpme:93
 #, fuzzy, c-format
 msgid "removing package %s will break your system"
 msgstr "Das Entfernen des Pakets „%s“ macht Ihr System unbrauchbar.\n"
 
-#: ../urpme:103
+#: ../urpme:95
 #, fuzzy, c-format
 msgid "Nothing to remove"
 msgstr "Nichts zu entfernen.\n"
 
-#: ../urpme:107
+#: ../urpme:99
 #, fuzzy, c-format
 msgid "Checking to remove the following packages"
 msgstr "Eines der folgenden Pakete wird benötigt:"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
 "Um die Abhängigkeiten zu erfüllen, werden die folgenden Pakete entfernt (%d "
 "MB)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (j/N) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, fuzzy, c-format
 msgid "removing %s"
 msgstr "Entfernen des Pakets „%s“"
 
-#: ../urpme:123
+#: ../urpme:115
 #, fuzzy, c-format
 msgid "Removing failed"
 msgstr "... das Kopieren schlug fehl!"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Eine schlechte Wahl, versuchen Sie es erneut\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, fuzzy, c-format
 msgid ""
 "urpmf version %s\n"
@@ -999,40 +949,40 @@ msgstr ""
 "Dies ist freie Software und kann unter den Bedingungen der GNU GPL weiter \n"
 "Vertrieben werden.\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - Verwende nur Aktualisierungs-Medien.\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, fuzzy, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - Benutze nur durch Kommata getrennte Medienliste.\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, fuzzy, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --media        - Benutze nur durch Kommata getrennte Medienliste.\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, fuzzy, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr "  --media        - Benutze nur durch Kommata getrennte Medienliste.\n"
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - Verwende die angegebene Synthese-Datei anstelle\n"
 "                   der urpmi-DB.\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - ausführlicher Modus.\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, fuzzy, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1041,93 +991,93 @@ msgid ""
 msgstr ""
 "  --quiet         - Keine Parameter ausgeben (Standard, wenn kein Parameter"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, fuzzy, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --size          - Ausgabe des Attributs „Größe“."
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all           - Alle Parameter ausgeben.\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, fuzzy, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group         - Ausgabe des Attributs „Gruppe“."
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, fuzzy, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size          - Ausgabe des Attributs „Größe“."
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, fuzzy, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --size          - Ausgabe des Attributs „Größe“."
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary       - Ausgabe des Attributs „Zusammenfassung“.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, fuzzy, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description   - Ausgabe des Attributs „Beschreibung“."
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, fuzzy, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr "  --group         - Ausgabe des Attributs „Gruppe“."
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, fuzzy, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr "  --group         - Ausgabe des Attributs „Gruppe“."
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, fuzzy, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr ""
 "  --files         - Ausgabe des Attribus „Dateien“ (mehrere Zeilen möglich)."
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, fuzzy, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --serial        - Ausgabe des Attributs „Seriennummer“."
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr "  --provides      - Ausgabe des Attributs „Stellt zur Verfügung“.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, fuzzy, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr ""
 "  --requires      - Ausgabe des Attributs „Benötigt“ (mehrere Zeilen "
 "möglich)."
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, fuzzy, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr ""
 "  --files         - Ausgabe des Attribus „Dateien“ (mehrere Zeilen möglich)."
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, fuzzy, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr ""
 "  --conflicts     - Ausgabe des Attributs „Steht in Konflikt mit“ (mehrere\n"
 "                    Zeilen möglich)."
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, fuzzy, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr "  --obsoletes     - Ausgabe des Attributs „Macht überflüssig“.\n"
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
@@ -1136,24 +1086,24 @@ msgstr ""
 "  --env          - Verwende ein besondere Umgebung (Etwa zur\n"
 "                   Erstellung von Fehlerberichten).\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, fuzzy, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr "  -f             - Erzwinge das Erstellen einer HD-Liste.\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - Ausgabe von Version, Release und Architektur mit dem "
 "Namen.\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, fuzzy, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -c             - Löschen des Header-Verzeichnisses.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, fuzzy, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
@@ -1161,47 +1111,47 @@ msgstr ""
 "  -u             - Entferne Paket wenn eine bessere Version schon "
 "installiert ist.\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 "  -o              - binärer ODER Operator, Wahr wenn ein Ausdruck wahr ist.\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, fuzzy, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 "  -u             - Entferne Paket wenn eine bessere Version schon "
 "installiert ist.\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, fuzzy, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
 "  -a             - Wähle alle Treffer in der Kommandozeile.\n"
 "\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, fuzzy, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
 "  -a             - Wähle alle Treffer in der Kommandozeile.\n"
 "\n"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
 "%s\n"
 msgstr ""
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1218,14 +1168,14 @@ msgstr ""
 "\n"
 "Verwendung:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, fuzzy, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - Verwende die angegebene Synthese-Datei anstelle\n"
 "                   der urpmi-DB.\n"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
@@ -1233,21 +1183,21 @@ msgstr ""
 "  --auto-select  - Automatische Paketauswahl zur Aktualisierung des "
 "Systems.\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr ""
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that leads to remove.\n"
 msgstr ""
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1255,37 +1205,37 @@ msgid ""
 "                   default is %d.\n"
 msgstr ""
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - unscharfe Suche erzwingen (identisch zu „-y“).\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - es folgt ein Quellpaket (identisch zu „-s“).\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - leert zu Begeinn den RPM-Cache.\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - belasse unverwendete RPMs im Cache.\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1294,7 +1244,7 @@ msgstr ""
 "  --allow-nodeps - Erlaube Anwenderbefragung zur Paketinstallation\n"
 "                   ohne Abhängigkeitskontrolle.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1303,29 +1253,29 @@ msgstr ""
 "  --allow-force  - Erlaube Anwenderbefragung zur Paketinstallation\n"
 "                   ohne Abhängigkeits- und Integritätskontrolle.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - Benutze wget um entfernte Dateien zu laden.\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - Benutze curl um entfernte Dateien zu laden.\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, fuzzy, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1335,7 +1285,7 @@ msgstr ""
 "                   (--no-verify-rpm deaktiviert das Verhalten,\n"
 "                   Voreingestellt: Kontrolle der Signaturen).\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1344,7 +1294,7 @@ msgstr ""
 "  --proxy        - Verwende einen HTTP Proxy, als Standard-Portnummer\n"
 "                   wird 1080 angenommen (Format: <ProxyRechner[:port]>).\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1354,7 +1304,7 @@ msgstr ""
 "                   Authentifizierung gegenüber dem Proxy\n"
 "                   (Format: <Benutzerkennzeichen:Passwort>).\n"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1363,12 +1313,12 @@ msgstr ""
 "  --bug          - Erstellen eines Fehlerberichts im durch das nächste\n"
 "                   Argument angegebenen Ordner.\n"
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - benutze X-Oberfläche.\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1377,7 +1327,7 @@ msgstr ""
 "  --best-output  - Benutze beste Oberfläche abhängig von der Umgebung:\n"
 "                   X or Text-Modus.\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1387,79 +1337,68 @@ msgstr ""
 "                   (--no-verify-rpm deaktiviert das Verhalten,\n"
 "                   Voreingestellt: Kontrolle der Signaturen).\n"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, fuzzy, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --media        - Benutze nur durch Kommata getrennte Medienliste.\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr ""
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 "  -a             - Wähle alle Treffer in der Kommandozeile.\n"
 "\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 "  -p             - Erlaube Suche in „Stellt zur Verfügung“ nach einem "
 "Paket.\n"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 "  -P             - nicht in „Stellt zur Verfügung“ nach dem Paket suchen.\n"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 "  -y             - unscharfe Suche erzwingen (identisch zu „--fuzzy“).\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s             - es folgt ein Quellpaket (identisch zu „--src“).\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - stiller Modus.\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  Namen oder RPM-Dateien von der Kommandozeile werden installiert.\n"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr ""
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "Ungültige Proxyangabe als Kommandozeilenparameter\n"
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: unbekannte Option „-%s“. Bitte Hilfe mit --help nachschlagen\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1472,22 +1411,22 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "Nichts machen"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr ""
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr ""
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1497,54 +1436,54 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, fuzzy, c-format
 msgid "Install it"
 msgstr "Die Installation schlug Fehl"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr ""
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Konnte das Verzeichnis [%s] für die Fehlerberichte nicht anlegen."
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Nur der Systemadministrator darf Pakete installieren."
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "Eines der folgenden Pakete wird zur Installation von %s benötigt:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Eines der folgenden Pakete wird benötigt:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Ihre Wahl? (1-%d) "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "Paketinstallation ..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "Initialisierung ..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, fuzzy, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1554,12 +1493,12 @@ msgstr ""
 "%s\n"
 "Sind Sie einverstanden?"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr "Sind Sie einverstanden?"
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1571,7 +1510,7 @@ msgstr ""
 "durchführen zu können:\n"
 "%s\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1581,16 +1520,16 @@ msgstr ""
 "durchführen zu können:\n"
 "%s"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
 "Um die Abhängigkeiten zu erfüllen, werden die folgenden Pakete installiert (%"
 "d MB)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1600,37 +1539,47 @@ msgstr ""
 "können:\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "Ich kann die Quellpakete nicht finden, Abbruch."
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Bitte legen Sie das Medium mit Namen „%s“ in Gerät „%s“."
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Betätigen Sie die Return-Taste, sobald Sie soweit sind ..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Holen des Pakets „%s“ ..."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr ""
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr ""
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Folgenden Pakete haben inkorrekte Signaturen:"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Wollen Sie die Installation fortsetzen?"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1641,59 +1590,59 @@ msgstr ""
 "%s\n"
 "Sie sollten Ihre urpmi-Datenbank aktualisieren"
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "Die Installation schlug Fehl"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, fuzzy, c-format
 msgid "distributing %s"
 msgstr "Verteile %s\n"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, fuzzy, c-format
 msgid "installing %s"
 msgstr ""
 " \n"
 "Installiere %s\n"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Installieren des Pakets „%s“ (%s/%s) ..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Soll ich eine Installation ohne Abhängigkeitstest versuchen? (j/N) "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Soll ich eine Installation mit Gewalt (--force) versuchen? (j/N) "
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d Installation schlugen Fehl"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "Die Installation ist möglich"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "Alles bereits installiert"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr ""
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1718,23 +1667,23 @@ msgstr ""
 "\n"
 "und [Optionen] aus\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - Erstellen eines Aktualisierungsmediums.\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, fuzzy, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
 "  -h             - Suche eine synthesis- oder hdlist-Datei und benutze sie.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, fuzzy, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
@@ -1742,7 +1691,7 @@ msgid ""
 msgstr ""
 "  -h             - Suche eine synthesis- oder hdlist-Datei und benutze sie.\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -1751,7 +1700,7 @@ msgstr ""
 "  --distrib      - automatisch alle Medien von einem Installations-Medium\n"
 "                   erzeugen.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1759,7 +1708,7 @@ msgid ""
 "                   anything else that has been configured ;-)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, fuzzy, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1768,7 +1717,7 @@ msgstr ""
 "  --env          - Verwende ein besondere Umgebung (Etwa zur\n"
 "                   Erstellung von Fehlerberichten).\n"
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1776,87 +1725,67 @@ msgid ""
 "                   installed mandrake-release package.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
 "                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - Löschen des Header-Verzeichnisses.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - Erzwinge das Erstellen einer HD-Liste.\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"Unbekannte Optionen „%s“\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "Ich kann keine Aktualisierungen von Cooker einspielen.\n"
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "Holen der Spiegelserver-Liste von %s ..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr ""
-"%s\n"
 "nicht erforderlich, <relativer Pfad zur HD-Liste> anzugeben mit --distrib"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "Ich kann das Medium „%s“ nicht aktualisieren.\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"<relativer Pfad zur HD-Liste> fehlt.\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<relativer Pfad zur HD-Liste> fehlt.\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, fuzzy, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"„with“ fehlt für FTP-Medien.\n"
+msgid "`with' missing for network media\n"
+msgstr "„with“ fehlt für FTP-Medien.\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "Ich kann das Medium „%s“ nicht anlegen.\n"
@@ -1875,6 +1804,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - Alle Medien auswählen.\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"Unbekannte Optionen „%s“\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1891,7 +1829,7 @@ msgstr ""
 "Was soll entfernt werden?\n"
 "(eins aus %s)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1900,29 +1838,29 @@ msgstr ""
 "Verwendung: urpmi.update [Optionen] <Name> ...\n"
 "Wobei <Name> das zu aktualisierende Medium ist.\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, fuzzy, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - Verwende nur Aktualisierungs-Medien.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr ""
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - Wählt alle nicht entfernbaren Medien..\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "Es gibt nichts zu aktualisieren (verwenden Sie „urpmi.addmedia“, \n"
 "um neue Medien hinzuzufügen)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1931,7 +1869,7 @@ msgstr ""
 "Was soll aktualisiert werden?\n"
 "(eins aus %s)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1946,40 +1884,40 @@ msgstr ""
 "Dies ist freie Software und kann unter den Bedingungen der GNU GPL weiter \n"
 "Vertrieben werden.\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list          - Alle verfügbaren Pakete auflisten.\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media    - Alle verfügbaren Medien auflisten.\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, fuzzy, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-media    - Alle verfügbaren Medien auflisten.\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 "  --list-nodes    - Alle  für „--parallel“ verfügbaren Knoten\n"
 "                    auflisten.\n"
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases  - Alle verfügbaren Aliase auflisten.\n"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
@@ -1989,7 +1927,7 @@ msgstr ""
 "urpmi-DB \n"
 "                   in die Standard-Ausgabe (nur root).\n"
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
@@ -1997,24 +1935,24 @@ msgstr ""
 "  --sources      - Gib alle Quellpakete vor dem Runterladen an (nur root).\n"
 ".\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, fuzzy, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --all           - Alle Parameter ausgeben.\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - Erweitere Anfrage auf Paket-Abhängigkeiten.\n"
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -2023,65 +1961,124 @@ msgstr ""
 "  -u             - Entferne Paket wenn bereits eine aktuellere Version "
 "installiert ist.\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, fuzzy, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 "                   wird angenommen, wenn kein Parameter angegeben wird)"
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, fuzzy, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 "  -p             - Erlaube Suche in „Stellt zur Verfügung“ nach einem "
 "Paket.\n"
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, fuzzy, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -r             - Ausgabe von Version und Release mit dem Namen.\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - Ausgabe der Gruppe mit dem Namen.\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - Ausgabe von Version und Release mit dem Namen.\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, fuzzy, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  --list          - Alle verfügbaren Pakete auflisten.\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 "  Namen oder rpm-Dateien, die auf der Kommandozeile angegeben wurden werden "
 "abgefragt.\n"
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-"urpmq: unbekannte Option „-%s“. Weitere Infos erhalten Sie \n"
-"mittels „urpmq --help“\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: Ich kann das RPM „%s“ nicht lesen.\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, fuzzy, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr ""
 "„--synthesis“ kann nicht mit „--media“, „--update“ oder „--parallel“ "
 "verwendet werden."
 
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "Unbekanntes Programm „%s“ zum Herunterladen der Pakete!!!\n"
+
+#, fuzzy
+#~ msgid "copy failed: %s"
+#~ msgstr "... das Kopieren schlug fehl!"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "wget fehlt\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "wget-Fehler: Beendet mit Rückgabewert '%d' oder Signal '%d'\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "curl fehlt\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "curl-Fehler: Beendet mit Rückgabewert %d oder Signal %d\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "rsync fehlt\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "rsync-Fehler: Beendet mit Rückgabewert %d oder Signal %d\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "ssh fehlt\n"
+
+#, fuzzy
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpmi: unbekannte Option „-%s“. Bitte Hilfe mit --help nachschlagen\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpmi: unbekannte Option „-%s“. Bitte Hilfe mit --help nachschlagen\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr ""
+#~ "Um die Abhängigkeiten zu erfüllen, werden die folgenden Pakete "
+#~ "installiert (%d MB)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "nicht erforderlich, <relativer Pfad zur HD-Liste> anzugeben mit --distrib"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "<relativer Pfad zur HD-Liste> fehlt.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "„with“ fehlt für FTP-Medien.\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpmq: unbekannte Option „-%s“. Weitere Infos erhalten Sie \n"
+#~ "mittels „urpmq --help“\n"
+
 #~ msgid "no webfetch (curl or wget currently) found\n"
 #~ msgstr ""
 #~ "Es ist kein Programm zum Herunterladen der Pakete (momentan unterstützt "
diff --git a/po/el.po b/po/el.po
index ec061907..146bc0bd 100644
--- a/po/el.po
+++ b/po/el.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-el\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2003-06-14 23:30+0300\n"
 "Last-Translator:  Νίκος Νύκταρης (Nick Niktaris) <niktarin@yahoo.com>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -52,22 +52,22 @@ msgstr ""
 "Αυτόματη εγκατάσταση πακέτων...\n"
 "Ζητήσατε την εγκατάσταση του πακέτου %s\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "Είναι εντάξει;"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "Εντάξει"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Άκυρο"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (Ν/ο) "
@@ -77,124 +77,63 @@ msgstr " (Ν/ο) "
 msgid "%s: command not found\n"
 msgstr "%s: η εντολή δε βρέθηκε\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "where [options] are from\n"
 msgstr ""
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - τύπωσε αυτό το μήνυμα βοήθειας.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, fuzzy, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "  --group         - τύπωση την ετικέτα της ομάδας: ομάδα.\n"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, fuzzy, c-format
 msgid "                    defaults is %s.\n"
 msgstr "  --list         - εμφάνιση διαθέσιμων πακέτων.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Άγνωστο webfetch `%s' !!!\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "καθορίστηκε άγνωστο πρωτόκολλο για το %s"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "αδυναμία χειρισμού πρωτόκολλου: %s"
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "η αντιγραφή απέτυχε: %s"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "το wget λείπει\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr ""
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "το curl λείπει\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr ""
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "το rsync λείπει\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr ""
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "το ssh λείπει\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% από %s ολοκληρώθηκε, ETA = %s, ταχύτητα = %s"
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% ολοκληρώθηκε, ταχύτητα = %s"
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "... η ανάκτηση απέτυχε: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "συντακτικό λάθος στο αρχείο ρυθμίσεων στη γραμμή %s"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 "το μέσο \"%s\" προσπαθεί να χρησιμοποιήσει την ήδη χρησιμοποιημένο hdlist, "
 "το μέσο θα αγνοηθεί"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 "το μέσο \"%s\" προσπαθεί να χρησιμοποιήσει την ήδη χρησιμοποιημένη λίστα, το "
 "μέσο θα αγνοηθεί"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -203,39 +142,39 @@ msgstr ""
 "αδυναμία ελέγχου του μέσου \"%s\" καθώς το αρχείο λίστας ήδη χρησιμοποιείται "
 "από άλλο μέσο"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 "αδυναμία χρήσης ονόματος \"%s\" για το ανώνυμο μέσο γιατί ήδη χρησιμοποιείται"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 "αδυνατώ να λάβω υπ' όψιν το μέσο \"%s\" καθώς δεν υπάρχει αρχείο λίστας [%s]"
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "αδυναμία καθορισμού του μέσου αυτού του αρχείου hdlist [%s]"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "αδυναμία πρόσβασης στο αρχείο hdlist του \"%s\", το μέσο θα αγνοηθεί"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "αδυναμία πρόσβασης στο αρχείο λίστας του \"%s\", το μέσο θα αγνοηθεί"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, fuzzy, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "προσπάθεια αποφυγής υπάρχοντος μέσου \"%s\""
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, fuzzy, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -244,94 +183,94 @@ msgstr ""
 "το μέσο \"%s\" προσπαθεί να χρησιμοποιήσει την ήδη χρησιμοποιημένη hdlist, "
 "το μέσο θα αγνοηθεί"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, fuzzy, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr ""
 "το μέσο \"%s\" προσπαθεί να χρησιμοποιήσει την ήδη χρησιμοποιημένη λίστα, το "
 "μέσο θα αγνοηθεί"
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "αδυναμία εύρεσης του αρχείου hdlist για το \"%s\", το μέσο θα αγνοηθεί"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "αδυναμία εύρεσης αρχείου λίστας για το \"%s\", το μέσο θα αγνοηθεί"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "μη συναφές αρχείο λίστας για το \"%s\", το μέσο αγνοείται"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "αδυναμία επιθεώρησης αρχείου λίστας για το \"%s\", το μέσο θα αγνοηθεί"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "πολλαπλά σημεία σύνδεσης για το αφαιρούμενο μέσο \"%s\""
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "λήψη της αφαιρούμενης συσκευής ως \"%s\""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "χρήση διαφορετικής αφαιρούμενης συσκευής  [%s] για το \"%s\""
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "αδυναμία ανάκτησης του ονόματος θέσης του αφαιρούμενου μέσου \"%s\""
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "αδυναμία εγγραφής του αρχείου ρυθμίσεων [%s]"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "εγγραφή αρχείου ρυθμίσεων [%s]"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, fuzzy, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "αδυναμία πρόσβασης στο rpm αρχείο [%s]"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, fuzzy, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "ανάγνωση αρχείου hdlist [%s]"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, fuzzy, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "ανάγνωση αρχείου hdlist [%s]"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr ""
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "αδυναμία χρήσης της επιλογής parallel \"%s\""
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, fuzzy, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -339,92 +278,92 @@ msgid ""
 msgstr ""
 "το --synthesis δεν μπορεί να χρησιμοποιηθεί με --media, --update ή --parallel"
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "εξέταση αρχείου synthesis [%s]"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "εξέταση αρχείου hdlist [%s]"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, fuzzy, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr ""
 "το μέσο \"%s\" προσπαθεί να χρησιμοποιήσει την ήδη χρησιμοποιημένη λίστα, το "
 "μέσο θα αγνοηθεί"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, fuzzy, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "πρόβλημα κατά την ανάγνωση του αρχείου synthesis από το μέσο \"%s\""
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "γίνεται δεύτερος έλεγχος για να υπολογιστούν οι εξαρτήσεις\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, fuzzy, c-format
 msgid "skipping package %s"
 msgstr "κανένα πακέτο με το όνομα %s"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, fuzzy, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "αδυναμία αφαίρεσης του πακέτου %s"
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "αδύνατο το άνοιγμα του rpmdb"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "το μέσο \"%s\" υπάρχει ήδη"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr ""
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "προστίθεται το μέσο %s"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "αδυναμία πρόσβασης στο πρώτο μέσο εγκατάστασης"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "αντιγραφή αρχείου hdlist..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "...η αντιγραφή απέτυχε"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "...η αντιγραφή ολοκληρώθηκε"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
@@ -433,43 +372,49 @@ msgstr ""
 "αδυναμία πρόσβασης στο πρώτο μέσο εγκατάστασης (δεν βρέθηκε αρχείο Mandrake/"
 "base/hdlists)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "ανάκτηση αρχείου hdlists..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "...η ανάκτηση ολοκληρώθηκε"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "... η ανάκτηση απέτυχε: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "λάθος περιγραφή hdlist \"%s\" μέσα στο αρχείο hdlists"
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, fuzzy, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "προσπάθεια επιλογής μη υπαρκτού μέσου \"%s\""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "επιλογής πολλαπλών μέσων: %s"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "αφαίρεση μέσου \"%s\""
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -477,7 +422,7 @@ msgid ""
 "medium."
 msgstr ""
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, fuzzy, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -486,222 +431,222 @@ msgstr ""
 "το μέσο \"%s\" προσπαθεί να χρησιμοποιήσει την ήδη χρησιμοποιημένη hdlist, "
 "το μέσο θα αγνοηθεί"
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "αντιγραφή αρχείου περιγραφής για το \"%s\"..."
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, fuzzy, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "τίποτα δεν γράφτηκε στο αρχείο λίστας για το \"%s\""
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "εξέταση αρχείου MD5SUM"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, fuzzy, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "τίποτα δεν γράφτηκε στο αρχείο λίστας για το \"%s\""
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, fuzzy, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "το wget του [%s] απέτυχε (ίσως λείπει το wget;)"
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, fuzzy, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "τίποτα δεν γράφτηκε στο αρχείο λίστας για το \"%s\""
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, fuzzy, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "η αντιγραφή του [%s] απέτυχε"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "πρόβλημα κατά την ανάγνωση του αρχείου synthesis από το μέσο \"%s\""
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "ανάγνωση αρχείων rpm από το [%s]"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "αδυναμία ανάγνωσης αρχείων rpm από το [%s]: %s"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "δεν βρέθηκαν αρχεία rpm από το [%s]"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, fuzzy, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "ανάκτηση πηγαίου hdlist (ή synthesis) για το \"%s\"..."
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, fuzzy, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "τίποτα δεν γράφτηκε στο αρχείο λίστας για το \"%s\""
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "η ανάκτηση του πηγαίου hdlist (ή synthesis) απέτυχε"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr ""
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, fuzzy, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "η ανάκτηση του πηγαίου hdlist (ή synthesis) απέτυχε"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "δεν βρέθηκε αρχείο hdlist για το μέσο \"%s\""
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "το αρχείο [%s] ήδη χρησιμοποιείται για το ίδιο μέσο \"%s\""
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "αδυναμία ανάγνωσης του hdlist αρχείου του \"%s\""
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "αδυναμία εγγραφής αρχείου λίστας του \"%s\""
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "εγγραφή αρχείου λίστας για το μέσο \"%s\""
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "τίποτα δεν γράφτηκε στο αρχείο λίστας για το \"%s\""
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, fuzzy, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "ανάκτηση αρχείου περιγραφής για το \"%s\"..."
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, fuzzy, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "αδυναμία εγγραφής αρχείου λίστας του \"%s\""
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, fuzzy, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "αδυναμία εγγραφής αρχείου λίστας του \"%s\""
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "ανάγνωση κεφαλίδων από το μέσο \"%s\""
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "δημιουργία hdlist [%s]"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "δημιουργία αρχείου σύνθεσης hdlist από το μέσο \"%s\""
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "βρέθηκαν %d κεφαλίδες στην cache"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "διαγραφή %d απαρχαιωμένων επικεφαλίδων από την cache"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "προσαρτώ το %s"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "αποπροσαρτώ %s"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, fuzzy, c-format
 msgid "relocated %s entries in depslist"
 msgstr "επανεντόπιση %s καταχωρήσεων στο depslist"
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, fuzzy, c-format
 msgid "no entries relocated in depslist"
 msgstr "επανεντόπιση %s καταχωρήσεων στο depslist"
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "λάθος όνομα αρχείου rpm [%s]"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "ανάκτηση αρχείου rpm [%s] ..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "αδυναμία πρόσβασης στο αρχείο rpm [%s]"
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "αδυναμία εγγραφής του αρχείου rpm"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "σφάλμα κατά την εγγραφή των τοπικών πακέτων"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "κανένα πακέτο με το όνομα %s"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Τα παρακάτω πακέτα περιέχουν %s: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "υπάρχουν πολλαπλά πακέτα με το ίδιο όνομα αρχείου rpm \"%s\""
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "αδυναμία σωστής απόδοσης του [%s] στην τιμή \"%s\""
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, fuzzy, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -710,143 +655,158 @@ msgstr ""
 "το μέσο \"%s\" χρησιμοποιεί άκυρο αρχείο λίστας ( ο διακομιστής μάλλον δεν "
 "είναι ενημερωμένος, προσπάθεια χρήσης εναλλακτικής μεθόδου)"
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "το μέσο \"%s\" δεν καθορίζει κάποια θέση για τα αρχεία rpm"
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "το πακέτο %s δεν βρέθηκε."
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "κλειδωμένη βάση δεδομένων urpmi"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "το μέσο \"%s\" δεν έχει επιλεγεί"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "αδυναμία ανάγνωσης του αρχείου rpm [%s] από το μέσο \"%s\""
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, fuzzy, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "το μέσο \"%s\" έχει αναφερθεί σαν αφαιρούμενο αλλά δεν είναι"
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "αδυναμία πρόσβασης στο μέσο \"%s\""
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "κακοδιατυπωμένη είσοδος: [%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "ανάκτηση αρχείων rpm από το μέσο \"%s\"..."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "Προετοιμασία..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr ""
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, fuzzy, c-format
 msgid "unable to create transaction"
 msgstr "αδυναμία δημιουργίας του μέσου \"%s\"\n"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, fuzzy, c-format
 msgid "removing package %s"
 msgstr "αδυναμία αφαίρεσης του πακέτου %s"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "αδυναμία αφαίρεσης του πακέτου %s"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr ""
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "αδυναμία εγκατάστασης του πακέτου %s"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "λόγω ελλείψεων %s"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "λόγω μη ικανοποίησης %s"
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, fuzzy, c-format
 msgid "trying to promote %s"
 msgstr "selecting %s by selection on files"
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, fuzzy, c-format
 msgid "in order to keep %s"
 msgstr "για να εγκατασταθεί το %s"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "για να εγκατασταθεί το %s"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "λόγω σύγκρουσεων με το %s"
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr "δεν ζητήθηκαν"
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr ""
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr ""
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr ""
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr ""
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: αδυναμία ανάγνωσης αρχείου rpm \"%s\"\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Λυπάμαι, κακή επιλογή, προσπαθήστε ξανά\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -863,116 +823,106 @@ msgstr ""
 "\n"
 "χρήση:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - τύπωσε αυτό το μήνυμα βοήθειας.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - αυτόματη επιλογή πακέτου στις επιλογές.\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 "  --test         - επαλήθευση ότι η εγκατάσταση μπορεί να επιτευχθεί σωστά.\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, fuzzy, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr ""
 "  --curl         - χρήση του curl για την ανάκτηση απομακρυσμένων αρχείων.\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - αναλυτική λειτουργία.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, fuzzy, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  --all           - τύπωσε όλα τα tags."
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: άγνωστη επιλογή \"-%s\", ελέγξτε τη χρήση με --help\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr "άγνωστα πακέτα"
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "άγνωστο πακέτο"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "η αφαίρεση του πακέτου %s θα καταστρέψει το σύστημά σας"
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr "Τίποτα προς αφαίρεση"
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "Έλεγχος για την αφαίρεση των παρακάτω πακέτων"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
 "Για να ικανοποιηθούν οι εξαρτήσεις (dependencies), τα παρακάτω πακέτα θα "
 "αφαιρεθούν (%d MB)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (ν/Ο) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, fuzzy, c-format
 msgid "removing %s"
 msgstr "αδυναμία αφαίρεσης του πακέτου %s"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr "Η αφαίρεση απέτυχε"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Λυπάμαι, κακή επιλογή, προσπαθήστε ξανά\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -989,39 +939,39 @@ msgstr ""
 "\n"
 "χρήση:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - χρήση μόνο των μέσων αναβάθμισης.\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - χρήση των μέσων που δίδονται, χωρισμένα με κόμμα.\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, fuzzy, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --media        - χρήση των μέσων που δίδονται, χωρισμένα με κόμμα.\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, fuzzy, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr "  --media        - χρήση των μέσων που δίδονται, χωρισμένα με κόμμα.\n"
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - χρήση του synthesis που δίδεται αντί του urpmi db.\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr ""
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, fuzzy, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1031,160 +981,160 @@ msgstr ""
 "  --quiet         - μην τυπώσεις το όνομα tag (εξ' ορισμού αν κανένα tag δεν "
 "δοθεί στην γραμμή"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, fuzzy, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --size          - τύπωση το μέγεθος της ετικέτας: μέγεθος.\n"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all           - τύπωσε όλα τις ετικέτες.\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group         - τύπωση την ετικέτα της ομάδας: ομάδα.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size          - τύπωση το μέγεθος της ετικέτας: μέγεθος.\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, fuzzy, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --size          - τύπωση το μέγεθος του tag: μέγεθος."
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary       - τύπωσε την περίληψη της ετικέτας: περίληψη.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description   - τύπωσε την περιγραφή της ετικέτας: περιγραφή.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, fuzzy, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr "  --group         - τύπωση την ετικέτα της ομάδας: ομάδα.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, fuzzy, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr "  --group         - τύπωση την ετικέτα της ομάδας: ομάδα.\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, fuzzy, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr ""
 "  --files         - τύπωσε τα αρχεία ετικέτας: όλα τα αρχεία (πολλαπλές "
 "γραμμές).\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, fuzzy, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --serial        - τύπωσε την ετικέτα serial: serial."
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, fuzzy, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr ""
 "  --provides      - τύπωσε τις παροχές του tag: όλες τις παροχές (πολλαπλές "
 "γραμμές)."
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, fuzzy, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr ""
 "  --requires      - τύπωσε την ετικέτα απαιτήσεων: όλες οι απαιτήσεις "
 "(πολλαπλές γραμμές).\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, fuzzy, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr ""
 "  --files         - τύπωσε τα αρχεία ετικέτας: όλα τα αρχεία (πολλαπλές "
 "γραμμές).\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, fuzzy, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr ""
 "  --conflicts     - τύπωσε τις συγκρούσεις ετικετών: όλες τις συγκρούσεις "
 "(πολλαπλές γραμμές).\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, fuzzy, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr ""
 "  --obsoletes     - τύπωσε τις απαρχαιωμένες ετικέτες : όλες τις "
 "απαρχαιωμένες (πολλαπλές γραμμές).\n"
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
 msgstr ""
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, fuzzy, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr "  --group         - τύπωση το tag group: group."
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, fuzzy, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  --all           - τύπωσε όλα τα tags."
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, fuzzy, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  --group         - τύπωση το tag group: group."
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, fuzzy, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr "  --all           - τύπωσε όλα τα tags."
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, fuzzy, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr "  --all           - τύπωσε όλα τα tags."
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
 "%s\n"
 msgstr ""
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1201,13 +1151,13 @@ msgstr ""
 "\n"
 "χρήση:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - χρήση του synthesis που δίδεται αντί του urpmi db.\n"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
@@ -1215,21 +1165,21 @@ msgstr ""
 "  --auto-select  - αυτόματη επιλογή πακέτων για την αναβάθμιση του "
 "συστήματος.\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr ""
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that leads to remove.\n"
 msgstr ""
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1237,76 +1187,76 @@ msgid ""
 "                   default is %d.\n"
 msgstr ""
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, fuzzy, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --all           - τύπωσε όλα τα tags."
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 "  --install-src  - εγκατάσταση μόνο του πηγαίου πακέτου (όχι εκτελέσιμα).\n"
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, fuzzy, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --all           - τύπωσε όλα τα tags."
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, fuzzy, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --all           - τύπωσε όλα τα tags."
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 "  --wget         - χρήση του wget για την ανάκτηση απομακρυσμένων αρχείων.\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 "  --curl         - χρήση του curl για την ανάκτηση απομακρυσμένων αρχείων.\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - περιόρισε την ταχύτητα λήψης.\n"
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, fuzzy, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1315,40 +1265,40 @@ msgstr ""
 "\n"
 " ενεργοποιημένο"
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
 msgstr ""
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
 msgstr ""
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - χρήση διεπαφής X.\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
 "                   X or text mode.\n"
 msgstr ""
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, fuzzy, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1357,75 +1307,64 @@ msgstr ""
 "\n"
 " ενεργοποιημένο"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr ""
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, fuzzy, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  --group         - τύπωση το tag group: group."
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, fuzzy, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  --all           - τύπωσε όλα τα tags."
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 "  -s             - το επόμενο πακέτο είναι πηγαίο πακέτο (ίδιο με το --"
 "src).\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - σιωπηλή λειτουργία.\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr ""
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr ""
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: άγνωστη επιλογή \"-%s\", ελέγξτε τη χρήση με --help\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, fuzzy, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr "έγινε"
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1438,22 +1377,22 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "Να μη γίνει τίποτα"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr ""
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr ""
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1463,54 +1402,54 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, fuzzy, c-format
 msgid "Install it"
 msgstr "Η εγκατάσταση απέτυχε"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr ""
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "αδυναμία δημιουργίας καταλόγου [%s] για την αναφορά σφάλματος"
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Μόνο ο υπερχρήστης επιτρέπεται να εγκαταστήσει πακέτα"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "Ένα εκ των παρακάτω πακέτων απαιτείται για την εγκατάσταση του %s:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Ένα εκ των παρακάτω πακέτων απαιτείται:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Ποιά είναι η επιλογή σας; (1-%d) "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "Εγκατάσταση πακέτου..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "Αρχικοποίηση..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, fuzzy, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1520,12 +1459,12 @@ msgstr ""
 "%s\n"
 "συμφωνείτε ;"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr ""
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1536,7 +1475,7 @@ msgstr ""
 "%s\n"
 "συμφωνείτε;"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1546,16 +1485,16 @@ msgstr ""
 "%s\n"
 "συμφωνείτε;"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
 "Για να ικανοποιηθούν οι εξαρτήσεις, τα παρακάτω πακέτα θα εγκατασταθούν (%d "
 "MB)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1564,37 +1503,47 @@ msgstr ""
 "Πρέπει να είστε root για να εγκαταστήσετε τις παρακάτω εξαρτήσεις:\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "αδυναμία λήψης των πηγαίων (source) πακέτων, εγκατάλειψη"
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Παρακαλώ βάλτε το μέσο με όνομα \"%s\" στη συσκευή [%s]"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Πατήστε enter όταν τελειώσετε..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, fuzzy, c-format
 msgid "Downloading package `%s'..."
 msgstr "αδυναμία αφαίρεσης του πακέτου %s"
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% από %s ολοκληρώθηκε, ETA = %s, ταχύτητα = %s"
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% ολοκληρώθηκε, ταχύτητα = %s"
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Τα παρακάτω πακέτα περιέχουν κακές υπογραφές"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Θέλετε να συνεχίσετε την εγκατάσταση ;"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1605,57 +1554,57 @@ msgstr ""
 "%s\n"
 "Ίσως να θέλετε να αναβαθμίσετε τη βάση δεδομένων urpmi"
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "Η εγκατάσταση απέτυχε"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, fuzzy, c-format
 msgid "distributing %s"
 msgstr "εγκατάσταση %s\n"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, fuzzy, c-format
 msgid "installing %s"
 msgstr "εγκατάσταση %s\n"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Εγκατάσταση πακέτου `%s' (%s/%s)..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Προσπάθεια για εγκατάσταση χωρίς τον έλεγχο των εξαρτήσεων; (ν/Ο) "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Προσπάθεια για πιο δυνατή εγκατάσταση (--force); (ν/Ο) "
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "Η εγκατάσταση απέτυχε"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "Η εγκατάσταση είναι δυνατή"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "Όλα είναι ήδη εγκατεστημένα"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr ""
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, fuzzy, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1678,24 +1627,24 @@ msgstr ""
 "       http://<host>/<path> with <relative filename of hdlist>\n"
 "       removable_<συσκευή>://<path>\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - δημιουργία μέσου αναβάθμισης.\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, fuzzy, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
 "  -h             - Προσπάθησε να βρεις και να χρησιμοποιήσεις το αρχείο\n"
 "                    synthesis hdlist.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, fuzzy, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
@@ -1704,14 +1653,14 @@ msgstr ""
 "  -h             - Προσπάθησε να βρεις και να χρησιμοποιήσεις το αρχείο\n"
 "                    synthesis hdlist.\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1719,14 +1668,14 @@ msgid ""
 "                   anything else that has been configured ;-)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr ""
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1734,87 +1683,66 @@ msgid ""
 "                   installed mandrake-release package.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
 "                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, fuzzy, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  --all           - τύπωσε όλα τα tags."
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - αναγκαστική δημιουργία αρχείων hdlist.\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"άγνωστες επιλογές '%s'\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "δεν μπορώ να προσθέσω αναβαθμίσεις για τις διανομές cooker\n"
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, fuzzy, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "ανάκτηση [%s]"
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"η χρειάζεται να δώσετε <σχετική διαδρομή του hdlist>  με το --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "η χρειάζεται να δώσετε <σχετική διαδρομή του hdlist>  με το --distrib"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "αδυναμία αναβάθμισης του μέσου \"%s\"\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"η <σχετική διαδρομή του hdlist> λείπει\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "η <σχετική διαδρομή του hdlist> λείπει\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, fuzzy, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"το `with' λείπει από το ftp media\n"
+msgid "`with' missing for network media\n"
+msgstr "το `with' λείπει από το ftp media\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "αδυναμία δημιουργίας του μέσου \"%s\"\n"
@@ -1833,6 +1761,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - επιλογή όλων των μέσων.\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"άγνωστες επιλογές '%s'\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1848,7 +1785,7 @@ msgstr ""
 "η επιλογή προς διαγραφή λείπει\n"
 "(ένα εκ των %s)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1857,28 +1794,28 @@ msgstr ""
 "χρήση:urpmi.update [επιλογές] <όνομα> ...\n"
 "όπου <όνομα> είναι ένα μέσο προς αναβάθμιση.\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - χρήση μόνο των μέσων αναβάθμισης\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr ""
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - επιλογή όλων των μη αφαιρούμενων μέσων.\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "τίποτα για αναβάθμιση (χρησιμοποιήστε urpmi.addmedia για προσθήκη μέσου)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1887,7 +1824,7 @@ msgstr ""
 "η επιλογή για αναβάθμιση λείπει\n"
 "(ένα εκ των %s)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1904,68 +1841,68 @@ msgstr ""
 "\n"
 "χρήση:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - εμφάνιση διαθέσιμων πακέτων.\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - εμφάνιση διαθέσιμων μέσων.\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, fuzzy, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-media   - εμφάνιση διαθέσιμων μέσων.\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, fuzzy, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr "  --all           - τύπωσε όλα τα tags."
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, fuzzy, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --all           - τύπωσε όλα τα tags."
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, fuzzy, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --all           - τύπωσε όλα τις ετικέτες.\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, fuzzy, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "                    γραμμή εντολών αλλά χωρίς όνομα πακέτου)."
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -1974,56 +1911,102 @@ msgstr ""
 "  -u             - αφαίρεση πακέτου εάν μια πιο πρόσφατη έκδοση είναι ήδη "
 "εγκατεστημένη.\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, fuzzy, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "                    γραμμή εντολών αλλά χωρίς όνομα πακέτου)."
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, fuzzy, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  --group         - τύπωση το tag group: group."
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, fuzzy, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "                    γραμμή εντολών αλλά χωρίς όνομα πακέτου)."
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, fuzzy, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  --group         - τύπωση το tag group: group."
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, fuzzy, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "                    γραμμή εντολών αλλά χωρίς όνομα πακέτου)."
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, fuzzy, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  --list         - εμφάνιση διαθέσιμων πακέτων.\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: άγνωστη επιλογή \"-%s\", ελέγξτε την σύνταξη με το --help\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: αδυναμία ανάγνωσης αρχείου rpm \"%s\"\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, fuzzy, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "  --all           - τύπωσε όλα τα tags."
 
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "Άγνωστο webfetch `%s' !!!\n"
+
+#~ msgid "copy failed: %s"
+#~ msgstr "η αντιγραφή απέτυχε: %s"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "το wget λείπει\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "το curl λείπει\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "το rsync λείπει\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "το ssh λείπει\n"
+
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpme: άγνωστη επιλογή \"-%s\", ελέγξτε τη χρήση με --help\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmi: άγνωστη επιλογή \"-%s\", ελέγξτε τη χρήση με --help\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr ""
+#~ "Για να ικανοποιηθούν οι εξαρτήσεις, τα παρακάτω πακέτα θα εγκατασταθούν (%"
+#~ "d MB)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "η χρειάζεται να δώσετε <σχετική διαδρομή του hdlist>  με το --distrib"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "η <σχετική διαδρομή του hdlist> λείπει\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "το `with' λείπει από το ftp media\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmq: άγνωστη επιλογή \"-%s\", ελέγξτε την σύνταξη με το --help\n"
+
 #, fuzzy
 #~ msgid ""
 #~ "  -d             - force complete computation of depslist.ordered file.\n"
diff --git a/po/eo.po b/po/eo.po
index 913e68a6..4bc6b5ea 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-eo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2003-08-22 15:28+0000\n"
 "Last-Translator: Vilhelmo Lutermano <vlutermano@free.fr>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
@@ -52,22 +52,22 @@ msgstr ""
 "Aŭtomata instalado de pakaĵoj...\n"
 "Vi mendis instaladon de pakaĵo %s\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "Ĉu tio estas bona?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "Jes"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Nuligu"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (J/n) "
@@ -77,159 +77,98 @@ msgstr " (J/n) "
 msgid "%s: command not found\n"
 msgstr "%s: ordono ne trovata\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "where [options] are from\n"
 msgstr ""
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - presu tiun ĉi help-mesaĝon.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, fuzzy, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "  --group         - printu etikedo-grupon: group.\n"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, fuzzy, c-format
 msgid "                    defaults is %s.\n"
 msgstr "  --list         - listigu haveblajn pakaĵojn.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Nekonata webfetch (teksprenilo) '%s' !!!\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "nekonata protokolo difinita por %s"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "ne povas uzi la protokolon: %s"
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "kopiado malsukcesis: %s"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "wget mankas\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget malsukcesis: eliris kun %d aŭ signalo %d\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "curl mankas\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl malsukcesis: eliris per %d aŭ signalo %d\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "rsync mankas\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "rsync malsukcesis: eliris per %d aŭ signalo %d\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "ssh mankas\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% of %s finita, ETA = %s, rapido = %s"
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% finita, rapido = %s"
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...ekstraktado malsukcesis: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "sintakseraro en konfigura dosiero ĉe linio %s"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 "datenportilo \"%s\" provas uzi jam uzitan hdlist, datenportilo ignorata"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 "datenportilo \"%s\" provis uzi jam uzitan liston, ignoras datenportilon"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
 "medium"
 msgstr "ne povis trakti pri medion \"%s\" ĉar alia medio jam uzas listdosieron"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr "ne povis uzi nomon \"%s\" por sennoma medio ĉar ĝi jam estas uzata"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr "ne povis konsideri medion \"%s\" ĉar ne ekzistas listdosieron [%s]"
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "ne povis determini medion de ĉi tiu \"hdlist\" dosiero [%s]"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "ne povas atingi \"hdlist\" dosieron de \"%s\", ignoris medion"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "ne povis atingi listdosieron de \"%s\", ignoris medion"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "provas ĉirkaŭiri ekzistantan medion \"%s:, evitas"
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -238,92 +177,92 @@ msgstr ""
 "virtuala datenportilo \"%s\" ne havu difinitan hdlist aŭ list-dosieron, "
 "datenportilo ignorata"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "virtuala datenportilo \"%s\" havu klaran url, datenportilo ignorata"
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "ne povis trovi \"hdlist\"-an dosieron por \"%s\", ignoris medion"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "ne povis trovi listdosieron por \"%s\", ignoris medion"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "nekohera listdosiero por \"%s\", medio ignorita"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "ne povas inspekti listdosieron por \"%s\", ignoris medion"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "tro da surmetingoj por movebla datenportilo \"%s\""
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "prenante moveblan aparaton kiel \"%s\""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "uzante alian moveblan aparaton [%s] por \"%s\""
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "ne povis ektrakti padonomon por movebla datenportilo \"%s\""
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "ne povas skribi konfigurodosieron [%s]"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "skribu konfiguran dosieron [%s]"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "ne povis analizi \"%s\" en dosiero [%s]"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "mi kontrolas la paralelan traktilon en dosiero [%s]"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "trovis paralelan traktilon por nodoj: %s"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "uzanta asociitaj datenportiloj por paralela modo: %s"
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "ne povis uzi paralelan opcion \"%s\""
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -332,90 +271,90 @@ msgstr ""
 "--sintezo ne uzeblas kun --media, --excludemedia, --sortmedia, --update aŭ --"
 "parallel"
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "mi kontrolas la sintezo-dosieron [%s]"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "kontrolanta hdlist-dosieron [%s]"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "virtuala datenportilo \"%s\" ne estas loka, datenportilo ignorata"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "problemo legante la hdlist aŭ sintezo-dosiero de datenportilo \"%s\""
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "mi faras duan pason por kalkuli dependaĵojn\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "transsaltu pakaĵon %s"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "instalus anstataŭ ĝisdatigi pakaĵon %s"
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "ne povis malfermi rpmdb"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "medio \"%s\" jam ekzistas"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr "virtuala datenportilo devas esti loka"
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "aldonita datenportilo %s"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "ne povis aliri la unuan instal-datenportilon"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "kopianta la hdlists-dosieron..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "...kopiado malsukcesis"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "...kopiado farita"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
@@ -424,43 +363,49 @@ msgstr ""
 "neeblas aliri la unuan instal-datenportilon (ne troviĝis dosieroMandrake/"
 "base/hdlists)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "mi ekstraktas la dosieron hdlists..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "... ekstraktado farita"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...ekstraktado malsukcesis: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "nevalida hd-list-priskribo \"%s\" en hd-list-dosiero"
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "provas elekti neekzistantan datenportilon \"%s\""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "mi elektas plurtipan datenportilon: %s"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "foriganta datenportilon \"%s\""
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -470,7 +415,7 @@ msgstr ""
 "ne povas aliri datenportilon \"%s\",\n"
 "tio povas okazi se vi mane surmetis la dosierujon kreante la datenportilon."
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -479,223 +424,223 @@ msgstr ""
 "virtuala datenportilo \"%s\" havu validan fonto-hdlist aŭ sintezon, "
 "datenportilo ignorata"
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "mi kopias priskrib-dosieron de \"%s\"..."
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "mi kalkulas md5sum de ekzistanta hd-listo (aŭ sintezo)"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "mi kontrolas dosieron MD5SUM"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "mi kopias fontan hd-liston (aŭ sintezon) de \"%s\""
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, fuzzy, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "wget de [%s] malsukcesis (eble wget mankas?)"
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "mi kalkulas md5sum de kopiita font-hdlist (aŭ sintezo)"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "kopiado de [%s] malsukcesis(md5sum-konfuzo)"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "problemo por legi sintezan dosieron por datenportilo \"%s\""
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "mi legas la rpm-dosierojn de [%s]"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "ne povis legi rpm-dosierojn de [%s]: %s"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "neniom da rpm-aj dosieroj trovataj de [%s]"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "ekstraktanta la font-hd-liston (aŭ sintezon) de \"%s\"..."
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "provita hd-listo (aŭ sintezo) trovita kiel %s"
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "kalkulata md5sum de ekstraktita fonto hdlist (aŭ sintezo)"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr "md5sum-konfuzo"
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "Ekstrakto de fonta hdlist (aŭ sintezo) malsukcesis"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "neniu \"hdlist\" dosiero trovita por medio \"%s\""
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "dosiero [%s] jam uzata en la sama datenportilo \"%s\""
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "ne povis analizi hdlist dosieron de \"%s\""
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "ne povis skribi listdosieron de \"%s\""
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "skribante list-dosieron por datenportilo \"%s\""
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "skribis nenion en listdosiero por \"%s\""
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, fuzzy, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "skribis nenion en listdosiero por \"%s\""
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, fuzzy, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "ne povis skribi listdosieron de \"%s\""
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, fuzzy, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "ne povis skribi listdosieron de \"%s\""
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "mi legas la ĉapojn de la datenportilo \"%s\""
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "konstruas \"hdlist\" [%s]"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "konstruis hdlist-an sintezan dosieron por medio \"%s\""
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "trovis %d ĉapdosierojn en kaŝejo"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "forigas %d jam ne uzatajn ĉapdosierojn en kaŝejo"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "muntas %s"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "malmuntas %s"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "translokigis %s enskribaĵojn en \"depslist\""
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "neniaj rikordoj lokitaj en depslist"
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "nevalida rpm-a dosiernomo [%s]"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "mi ekstraktas rpm-dosieron [%s] ..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "ne povis atingi rpm-an dosieron [%s]"
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "ne povas registri rpm-dosieron"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "eraro dum registri lokajn pakaĵojn"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "neniu pakaĵo nomata %s"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "La sekvantaj pakaĵoj enhavas %s: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 "ekzistas plurajn pakaĵojn kiuj havas la saman rpm-an dosiernomon \"%s\""
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "ne povis ĝuste analizi [%s] je valoro \"%s\""
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -704,144 +649,159 @@ msgstr ""
 "datenportilo \"%s\" uzas nevalidan list-dosieron:\n"
 "  spegulo estas eble ne ĝisdata, provu uzi alternativan metodon"
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "la datenportilo \"%s\" ne difinas ian lokon por rpm-dosieroj"
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "pakaĵo %s ne estis trovata."
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi-datenbazo ŝlosita"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "medio \"%s\" ne estas elektata"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "ne povis legi rpm-an dosieron [%s] de medio \"%s\""
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "malkohera medio \"%s\" indikita forigebla sed ne vere"
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "ne povis atingi medion \"%s\""
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "malbone formata enigo: [%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "ekstraktanta la rpm-dosierojn de datenportilo \"%s\"..."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "Mi preparas..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr ""
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 "transakcio kreita por instali sur %s (forigu=%d, instalu=%d, ĝisdatigu=%d)"
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr "ne povis krei transakcion"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "mi forigas la pakaĵon %s"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "ne povas forigi pakaĵon %s"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "mi aldonas pakaĵon %s (id=%d, eid=%d, ĝisdatigo=%d, dosiero=%s)"
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "ne povas instali pakaĵon %s"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "pro mankanta %s"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "pro neplenumita %s"
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr "mi provas disponigi %s"
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr "por konservi %s"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "por instali %s"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "pro konflikto kun %s"
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr "nepetita"
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Nevalida signaturo (%s)"
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "Nevalida Ŝlosil-ID (%s)"
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Mankas signaturo (%s)"
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "malĝusta deklaro de prokuro en la komanda linio\n"
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: ne povas legi rpm-an dosieron \"%s\"\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Bedaŭrinde, nevalida elekto, reprovu\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -858,113 +818,103 @@ msgstr ""
 "\n"
 "uzado:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - presu tiun ĉi help-mesaĝon.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - automate elektu pakaĵon en elektoj.\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 "  --test         - kontrolu ĉu la instalado povas esti ĝuste arĥivota.\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - trudu envokon eĉ se iuj pakaĵoj ne ekzistas.\n"
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - distribuita urpmi tra maŝinoj de kromnomo.\n"
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, fuzzy, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --curl         - uzu curl por ekstrakti forajn dosierojn.\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - babilema modo.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - elektu ĉiujn pakaĵojn kongruajn kun la esprimo.\n"
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: nekonata opcio \"-%s\", kontrolu uzadon per \"--help\"\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr "nekonataj pakaĵoj"
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "nekonata pakaĵo"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "forigi pakaĵon %s detruos vian sistemon"
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr "Nenio forigenda"
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "Mi kontrolas por forigi la sekvajn pakaĵojn"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr "Por plenumi dependaĵojn, la sekvantaj pakaĵoj estas forigotaj (%d mb)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (J/n) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "foriganta %s"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr "Forigado malsukcesis"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Bedaŭrinde, nevalida elekto, reprovu\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -981,24 +931,24 @@ msgstr ""
 "\n"
 "uzado:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - uzu nur ĝisdatigajn datenportilojn.\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 "  --media        - uzu nur la donitajn datenportilojn, disigitajn per komo.\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 "  --excludemedia - ne uzu la donitan datenportilon, disigitan per komo.\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1006,17 +956,17 @@ msgstr ""
 "  --sortmedia    - vicigu la datenportilojn laŭ subĉenoj disigitaj per "
 "komo.\n"
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr "  --synthesis    - uzu la donitan sintezon anstataŭ la urpmi-db.\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - babilema modo.\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1027,87 +977,87 @@ msgstr ""
 "en la komanda\n"
 "                   linio, malkongrua kun interaga modo).\n"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --uniq         - ne printu identajn liniojn.\n"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all           - printu ĉiujn etikedojn.\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group         - printu etikedo-grupon: group.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size         - printu grandecon de etikedo: size.\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --epoch        - printu etikedon epoĥo: epoch.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --group         - printu etikedan resumon: summary.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description  - printu etikedan priskribon: description.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr "  --sourcerpm    - printu etikedon sourcerpm: source rpm.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr "  --packager     - printu etiked-pakilon: packager.\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr "  --buildhost    - printu etikedon buildhost: build host.\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --url          - presu url-on de etikedo: url.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr "  --provides      - presu etikedan provizon: ĉiuj provizoj.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr "  --requires      - printu etikedan postulojn: ĉiujn postulojn.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files        - printu etikedajn dosierojn: ĉiujn dosierojn.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr "  --conflicts     - printu etikedajn konfliktojn: ĉiuj konfliktoj.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr "  --obsoletes     - printu etikedajn arkaikojn: ĉiuj arkaikoj.\n"
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
@@ -1116,22 +1066,22 @@ msgstr ""
 "  --env          - uzu specifan medion (tipe estas cim-\n"
 "                   raporto).\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr "  -i             - ignoru ĉiufoje usklecon.\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - printu version, eldonon kaj arkivon kun nomo.\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - anigu perl-kodon rekte kiel perl -e.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
@@ -1139,29 +1089,29 @@ msgstr ""
 "  -a             - binara KAJ-operatoro, vera se ambaŭ esprimoj estas "
 "veraj.\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 "  -o             - binara AŬ-operatoro, vera se unu esprimo estas vera.\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - unuloka NE, vera se esprimo estas malĝusta.\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr "  (              - maldekstra parentezo por malfermi grup-esprimon.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr "  )              - dekstra parentezo por fermi grup-esprimon.\n"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
@@ -1170,12 +1120,12 @@ msgstr ""
 "callback estas :\n"
 "%s\n"
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "uzante specifan medion sur %s\n"
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1192,19 +1142,19 @@ msgstr ""
 "\n"
 "uzado:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - uzu la donitan sintezon anstataŭ la urpmi-db.\n"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 "  --auto-select  - aŭtomate elektas pakaĵojn por ĝisdatigi la sistemon.\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
@@ -1212,7 +1162,7 @@ msgid ""
 msgstr ""
 "  --no-uninstall - neniam petu malinstali pakaĵon, ĉesigu la instaladon.\n"
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1222,7 +1172,7 @@ msgstr ""
 "postulatajn\n"
 "                   pakaĵojn kiuj kondukas al forigo.\n"
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1233,38 +1183,38 @@ msgstr ""
 "                   estas instalotaj aŭ ĝisdatigotaj,\n"
 "                   defaŭlta estas %d.\n"
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - eta transakcio-longo, defaŭlta estas %d.\n"
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - trudu serĉadon de dubindaĵoj (same kiel -y).\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - venonta pakaĵo estas font-pakaĵo (same kiel -s).\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - instalu nur font-pakaĵojn (ne binarajn).\n"
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 "  --clean        - forigu rpm el la kaŝejo antaŭ ol fari ion ajn alian.\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - konservu rpm ne uzatan en kaŝejo.\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1273,7 +1223,7 @@ msgstr ""
 "  --allow-nodeps - permesu peti la uzulon instali pakaĵojn sen\n"
 "                   kontrolado de dependaĵoj.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1282,29 +1232,29 @@ msgstr ""
 "  --allow-force  - permesu peti uzulon instali pakaĵojn sen\n"
 "                   dependaĵ-kontrolo kaj integreco.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - uzu wget por ekstrakti forajn dosierojn.\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - uzu curl por ekstrakti forajn dosierojn.\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - limigu la deŝut-rapidon.\n"
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, fuzzy, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1313,7 +1263,7 @@ msgstr ""
 "  --verify-rpm   - kontrolu rpm-signaturon antaŭ instalado\n"
 "                   (--no-verify-rpm elŝaltu ĝin, defaŭlta estas enŝaltita).\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1324,7 +1274,7 @@ msgstr ""
 "                   1080 defaŭlte (la formato estas <prokura gastiganto[:"
 "pordo]>).\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1333,7 +1283,7 @@ msgstr ""
 "  --proxy-user   - difinu uzulon kaj pasvorton por uzi prokuran\n"
 "                   aŭtentigon (formato estas <uzulo:pasvorto>).\n"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1342,12 +1292,12 @@ msgstr ""
 "  --bug          - eligu cim-raporton en dosierujon indikitan de\n"
 "                   next arg.\n"
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - uzu X-interfacon.\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1356,7 +1306,7 @@ msgstr ""
 "  --best-output  - elektu la plej bonan interfacon laŭ la medio:\n"
 "                   X- aŭ tekst-modo.\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1365,75 +1315,64 @@ msgstr ""
 "  --verify-rpm   - kontrolu rpm-signaturon antaŭ instalado\n"
 "                   (--no-verify-rpm elŝaltu ĝin, defaŭlta estas enŝaltita).\n"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - eksigu padon disigitan de komo.\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr ""
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - elektu ĉiujn kongruojn en la komanda linio.\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 "  -p             - permesu serĉadon en \"disponigas\" por trovi la pakaĵon.\n"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - ne serĉu en provides por trovi pakaĵon.\n"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - trudu serĉadon de dubindaĵoj (same kiel --fuzzy).\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 "  -s             - sekvanta pakaĵo estas font-pakaĵo (same kiel --src).\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - silenta modo.\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  nomoj aŭ rpm-dosieroj tapitaj en la komanda linio instaliĝos.\n"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr ""
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "malĝusta deklaro de prokuro en la komanda linio\n"
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: nekonata opcio \"-%s\", kontrolu uzadon kun \"--help\"\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr "Kio fareblas per binaraj rpm-dosieroj se uzante --install-src"
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1446,22 +1385,22 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "Faru nenion"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr ""
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr ""
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1471,54 +1410,54 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, fuzzy, c-format
 msgid "Install it"
 msgstr "Instalado malsukcesis"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr ""
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Ne povas krei dosierujon [%s] por cim-raporto"
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Nur superuzulo rajtas instali pakaĵojn"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "Unu el la sekvantaj pakaĵoj estas bezonata por instali %s:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Unu el la sekvantaj pakaĵoj estas bezonata:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Kiu estas via elekto? (1-%d) "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "Instalado de pakaĵo..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "Mi pravalorizas..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1527,12 +1466,12 @@ msgstr ""
 "Iuj postulataj pakaĵoj ne instaleblas:\n"
 "%s"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr "ĉu vi konsentas ?"
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1543,7 +1482,7 @@ msgstr ""
 "forigotas por ke aliaj estu ĝisdatigotaj:\n"
 "%s\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1552,14 +1491,14 @@ msgstr ""
 "La sekvaj pakaĵoj estas forigotaj por ke aliaj estu ĝisdatigotaj:\n"
 "%s"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr "Por plenumi dependaĵojn, la sekvantaj pakaĵoj estas instalonta (%d mb)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1568,37 +1507,47 @@ msgstr ""
 "Vi devas esti root por instali la sekvajn dependaĵojn:\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "Ne povas preni fontajn pakaĵojn.  Mi ĉesiĝas."
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Bonvole enŝovu la medion nomata \"%s\" en aparato [%s]"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Premu la enigklavon kiam vi pretas..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Mi deŝutas pakaĵon '%s'..."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% of %s finita, ETA = %s, rapido = %s"
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% finita, rapido = %s"
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "La sekvantaj pakaĵoj havas malĝustajn signaturojn"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Ĉu vi deziras daŭrigi la instaladon ?"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1609,57 +1558,57 @@ msgstr ""
 "%s\n"
 "Eble vi ĝisdatigu vian urpmi-datenbazon"
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "Instalado malsukcesis"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr "distribuanta %s"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr "instalas %s"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Mi instalas pakaĵon '%s' (%s/%s)..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Provu instaladon sen kontroli dependaĵojn? (j/N) "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Provu instaladon eĉ pli forte (--force)? (j/N) "
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "La instal-transakcio %d malsukcesis"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "Instalado eblas"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "ĉio jam instalita"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr ""
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1684,22 +1633,22 @@ msgstr ""
 "\n"
 "kaj [opcioj] estas de\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - kreu ĝisdatigan datenportilon.\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr "  --probe-synthesis - provu trovi kaj uzi sintezan dosieron.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr "  --probe-hdlist - provu trovi kaj uzi hd-listan dosieron.\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
@@ -1708,7 +1657,7 @@ msgstr ""
 "  --no-probe     - ne provu trovi ian sintezon aŭ\n"
 "                   hdlist-dosieron.\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -1717,7 +1666,7 @@ msgstr ""
 "  --distrib      - kreas aŭtomate ĉiujn datenportilojn de instala\n"
 "                   datenportilo.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1729,7 +1678,7 @@ msgstr ""
 "(contrib), ĝisdatigoj (updates) aŭ\n"
 "                   io ajn alia kio estis konfigurita ;-)\n"
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1739,7 +1688,7 @@ msgstr ""
 "defaŭlta estas\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1751,7 +1700,7 @@ msgstr ""
 "                   de la versio de la eldono indikita de la\n"
 "                   instalita mandrak-eldon-pakaĵo.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
@@ -1760,7 +1709,7 @@ msgstr ""
 "  --arch         - uzu indikitan arkitekturon, la defaŭlta estas arch de\n"
 "                   la instalita mandrak-eldon-pakaĵo.\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
@@ -1769,73 +1718,52 @@ msgstr ""
 "  --virtual      - kreu virtualan datenportikojn ĉiam ĝisdatajn,\n"
 "                   nur dosiero:// protokolo estas permesita.\n"
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - purigu la dosieron de kap-kaŝejo.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - trudu generadon de hdlist-dosieroj.\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"nekonataj opcioj '%s'\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "mi ne povas aldoni ĝisdatigojn de \"cooker\"-eldono\n"
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "mi ekstraktas spegulojn ĉe %s ..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"ne bezonas doni <relative path of hdlist> per --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "ne bezonas doni <relative path of hdlist> per --distrib"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "ne povis ĝisdatigi medion \"%s\"\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"<relativa dosieronomo de hd-listo> mankas\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<relativa dosieronomo de hd-listo> mankas\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"`with' mankas por reta datenportilo\n"
+msgid "`with' missing for network media\n"
+msgstr "`with' mankas por reta datenportilo\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "ne povis krei medion \"%s\"\n"
@@ -1854,6 +1782,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - elektu ĉiujn datenportilojn.\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"nekonataj opcioj '%s'\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1868,7 +1805,7 @@ msgstr ""
 "la enskribaĵo por forpreni mankas\n"
 "(unu el %s)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1877,27 +1814,27 @@ msgstr ""
 "uzado: urpmi.update [opcioj] <nomo> ...\n"
 "kie <nomo> estas nomo de ĝisdatigota datenportilo.\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - ĝisdatigu nur ĝisdatigajn datenportilojn.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr ""
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - elektu ĉiujn nemoveblajn datenportilojn.\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "nenio por ĝisdatigi (uzu urpmi.addmedia por aldoni medion)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1906,7 +1843,7 @@ msgstr ""
 "la enskribaĵo por ĝisgatigi mankas\n"
 "(unu el %s)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1923,39 +1860,39 @@ msgstr ""
 "\n"
 "uzado:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - listigu haveblajn pakaĵojn.\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - listigu haveblajn datenportilojn.\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, fuzzy, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-media   - listigu haveblajn datenportilojn.\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 "  --list-nodes   - listigas haveblajn nodojn kiam vi uzas --parallel.\n"
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - listigu haveblajn paralelajn kromnomojn.\n"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
@@ -1964,31 +1901,31 @@ msgstr ""
 "  --headers      - ekstraktu ĉapojn por la pakaĵo listigita de urpmi db al\n"
 "                   stdout (nur root).\n"
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 "  --sources      - donu ĉiujn font-pakaĵojn antaŭ ol deŝuti (nur root).\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, fuzzy, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --all           - printu ĉiujn etikedojn.\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - etendu la informmendon al pakaĵ-dependaĵoj.\n"
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -1996,57 +1933,110 @@ msgid ""
 msgstr ""
 "  -u             - forigu pakaĵon se pli freŝa versio estas jaminstalita.\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - kompleta eligo kun forigota pakaĵo.\n"
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - retroiru serĉadon al tio kion postulas la pakaĵo.\n"
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -i             - presu uzeblan informon en homlega formo.\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - printu grupojn ankaŭ kun nomo.\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - presu version kaj ankaŭ eldonon kun nomo.\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, fuzzy, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  --list         - listigu haveblajn pakaĵojn.\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 "  nomoj aŭ rpm-dosieroj donitaj en komand-linio estas informmendataj.\n"
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: nekonata opcio \"-%s\", kontrolu uzadon kun \"--help\"\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: ne povas legi rpm-an dosieron \"%s\"\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes uzeblas nur kun --parallel"
 
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "Nekonata webfetch (teksprenilo) '%s' !!!\n"
+
+#~ msgid "copy failed: %s"
+#~ msgstr "kopiado malsukcesis: %s"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "wget mankas\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "wget malsukcesis: eliris kun %d aŭ signalo %d\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "curl mankas\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "curl malsukcesis: eliris per %d aŭ signalo %d\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "rsync mankas\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "rsync malsukcesis: eliris per %d aŭ signalo %d\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "ssh mankas\n"
+
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpme: nekonata opcio \"-%s\", kontrolu uzadon per \"--help\"\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmi: nekonata opcio \"-%s\", kontrolu uzadon kun \"--help\"\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr ""
+#~ "Por plenumi dependaĵojn, la sekvantaj pakaĵoj estas instalonta (%d mb)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "ne bezonas doni <relative path of hdlist> per --distrib"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "<relativa dosieronomo de hd-listo> mankas\n"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "`with' mankas por reta datenportilo\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmq: nekonata opcio \"-%s\", kontrolu uzadon kun \"--help\"\n"
+
 #~ msgid "no webfetch (curl or wget currently) found\n"
 #~ msgstr "ne trovita webfetch [ret-prenilo] (kutime curl aŭ wget)\n"
 
diff --git a/po/es.po b/po/es.po
index 5d5735b2..0c4c1cad 100644
--- a/po/es.po
+++ b/po/es.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2004-03-05 08:52-0300\n"
 "Last-Translator: Fabian Mandelbaum <fabman@mandrakesoft.com>\n"
 "Language-Team: Español <es@li.org>\n"
@@ -54,22 +54,22 @@ msgstr ""
 "Instalación automática de paquetes...\n"
 "Pidió la instalación del paquete %s\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "¿Está todo bien?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "Aceptar"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (S/n) "
@@ -79,7 +79,7 @@ msgstr " (S/n) "
 msgid "%s: command not found\n"
 msgstr "%s: comando no encontrado\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
@@ -88,113 +88,52 @@ msgstr ""
 "uso: %s [opciones]\n"
 "donde [opciones] son\n"
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - imprime este mensaje de ayuda.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "   -g [grupo]     - restringe los resultados al grupo dado.\n"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, c-format
 msgid "                    defaults is %s.\n"
 msgstr "                    lo predeterminado es %s.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "¡¡¡programa para bajar de la red «%s» desconocido!!!\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "protocolo desconocido definido para %s"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "no se encontró webfetch, los webfetch soportados son: %s\n"
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "no se puede manejar el protocolo: %s"
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "falló la copia: %s"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "no se encuentra wget\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget falló: salió con %d o señal %d\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "falta curl\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl falló: salió con %d o señal %d\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "falta rsync\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "rsync falló: terminó con %d o señal %d\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "falta ssh\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% de %s completado, ETA = %s, velocidad = %s"
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% completado, velocidad = %s"
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...falló la recuperación: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "error de sintaxis en archivo de configuración, en la línea %s"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr "soporte «%s» intenta utilizar un hdlist ya usado, soporte ignorado"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr "soporte «%s» intenta utilizar una lista ya usada, soporte ignorado"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -203,41 +142,41 @@ msgstr ""
 "no se puede utilizar el soporte «%s» como archivo de lista que ya utiliza "
 "otro soporte"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 "no se puede utilizar el nombre «%s» para un soporte sin denominar porque ya "
 "se está utilizando"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 "no se puede tener en cuenta el soporte «%s», porque no existe archivo de "
 "lista [%s]"
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "no se puede determinar el soporte de este archivo hdlist [%s]"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "no se puede acceder al archivo hdlist de «%s», soporte ignorado"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "no se puede acceder al archivo de la lista de «%s», soporte ignorado"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "intentando pasar al soporte existente «%s», evitando"
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -246,93 +185,93 @@ msgstr ""
 "el soporte virtual «%s» no debería tener definido hdlist o archivo de lista, "
 "soporte ignorado"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "soporte virtual «%s» debería tener una URL limpia, soporte ignorado"
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "no se puede encontrar el archivo hdlist para «%s», soporte ignorado"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "no se puede encontrar el archivo de lista para «%s», soporte ignorado"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "archivo de lista no coherente para «%s», soporte ignorado"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
 "no se puede inspeccionar el archivo de lista para «%s», soporte ignorado"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "demasiados puntos de montaje para medios extraíbles «%s»"
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "tomar dispositivo extraíble como «%s»"
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "usar dispositivo extraíble diferente [%s] para «%s»"
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "no se puede recuperar el nombre de ruta para medio extraíble «%s»"
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "no se puede escribir el archivo de configuración [%s]"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "escrito archivo de configuración [%s]"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "No se puede usar el modo paralelo con el modo use-distrib"
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "no se puede analizar \"%s\" en el archivo [%s]"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "examinando el manejador paralelo en el archivo [%s]"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "se encontró manejador paralelo para los nodos: %s"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "usando el soporte asociado para el modo paralelo: %s"
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "no se puede utilizar la opción paralelo «%s»"
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -341,90 +280,90 @@ msgstr ""
 "--synthesis no se puede usar con --media, --excludemedia, --sortmedia, --"
 "update o --parallel"
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "examinando el archivo de síntesis [%s]"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "examinando el archivo hdlist [%s]"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "soporte virtual «%s» no es local, soporte ignorado"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "problema leyendo hdlist o el archivo de síntesis del soporte «%s»"
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "realizando una segunda pasada para computar las dependencias\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "omitiendo paquete %s"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "instalaría en vez de actualizar el paquete %s"
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "no se puede abrir rpmdb"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "ya existe el soporte «%s»"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr "soporte virtual debe ser local"
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "añadido soporte %s"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "no se puede acceder al primer soporte de la instalación"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "copiando archivo hdlists..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "...falló la copia"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "...copia hecha"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
@@ -433,43 +372,49 @@ msgstr ""
 "no se puede acceder al primer soporte de la instalación (no se encontró el "
 "archivo Mandrake/base/hdlists)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "recuperando archivo hdlists..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "...recuperación hecha"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...falló la recuperación: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "descripción de hdlist no válida «%s» en archivo hdlists"
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "intentando seleccionar soporte inexistente \"%s\""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "seleccionando soportes múltiples: %s"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "«%s»"
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "quitando el soporte «%s»"
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -479,7 +424,7 @@ msgstr ""
 "no se puede acceder soporte \"%s\",\n"
 "esto puede ocurrir si montó manualmente el directorio cuando creó el soporte."
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -488,222 +433,222 @@ msgstr ""
 "soporte virtual «%s» debería tener un hdlist fuente o síntesis válido, "
 "soporte ignorado"
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "copiando descripción de archivo de «%s»..."
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "computando md5sum de hdlist fuente (o síntesis) existente"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "examinando el archivo MD5SUM"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "copiando hdlist fuente (o síntesis) de «%s»..."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "falló la copia de [%s] (el archivo es sospechosamente pequeño)"
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "computando md5sum de hdlist fuente (o síntesis) copiado"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "falló la copia de [%s] (no coincide md5sum)"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "problema leyendo el archivo de síntesis del soporte «%s»"
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "leyendo archivos rpm de [%s]"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "no se pueden leer los archivos rpm de [%s]: %s"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "no se encontraron archivos rpm en [%s]"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "recuperando hdlist fuente (o síntesis) de «%s»..."
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "encontrado hdlist por prueba (o síntesis) como «%s»"
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "computando md5sum del hdlist fuente (o síntesis) recuperado"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr "no concuerda md5sum"
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "falló la recuperación de hdlist fuente (o síntesis)"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "no se encuentra el archivo hdlist para el soporte «%s»"
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "archivo [%s] ya utilizado en el mismo soporte «%s»"
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "no se puede interpretar el archivo hdlist de «%s»"
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "no se puede escribir el archivo de lista de «%s»"
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "escribiendo archivo de lista para el soporte «%s»"
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "nada escrito en el archivo de lista para «%s»"
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "examinando archivo de clave pública de «%s»..."
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "... se importó clave %s desde archivo de clave pública de «%s»"
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "no se puede importar archivo de clave pública de «%s»"
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "leyendo encabezados del soporte «%s»"
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "generando hdlist [%s]"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "se generó el archivo de síntesis hdlist para el soporte «%s»"
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "se encontraron %d encabezados en el cache"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "quitando %d encabezados obsoletos del cache"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "montando %s"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "desmontando %s"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "relocalizadas %s entradas en la lista de dependencias"
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "no hay entradas reubicadas en depslist"
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "nombre de archivo rpm no válido [%s]"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "obteniendo archivo rpm [%s] ..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "no se puede acceder al archivo rpm [%s]"
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "no se puede registrar el archivo rpm"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "error registrando paquetes locales"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "ningún paquete llamado %s"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Los siguientes paquetes contienen %s: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "hay muchos paquetes con el mismo nombre de archivo rpm «%s»"
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "no se puede analizar correctamente [%s] sobre el valor «%s»"
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -713,62 +658,62 @@ msgstr ""
 "  probablemente el sitio de réplica no está actualizado, intentando método "
 "alternativo"
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "el soporte «%s» no define ubicación alguna para archivos rpm"
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "no se encontró el paquete %s."
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "base de datos de urpmi bloqueada"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "el soporte «%s» no está seleccionado"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "no se puede leer el archivo rpm [%s] del soporte «%s»"
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "soporte no coherente «%s» marcado como borrable, pero no borrado"
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "no se puede acceder al soporte «%s»"
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "entrada mal formada [%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "obteniendo archivos rpm desde el soporte  «%s» ..."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "Preparando..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "usando proceso %d para ejecutar la transacción"
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -776,82 +721,97 @@ msgstr ""
 "transacción creada para instalar sobre %s (quitar=%d, instalar=%d, "
 "actualizar=%d)"
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr "no se puede crear transacción"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "quitando paquete %s"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "no se puede quitar el paquete %s"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "añadiendo paquete %s (id=%d, eid=%d, actualización=%d, archivo=%s)"
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "no se puede instalar el paquete %s"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "debido a que falta %s"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "debido a que no se satisfizo %s"
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr "intentando promover %s"
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr "para mantener %s"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "para instalar %s"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "debido a conflictos con %s"
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr "no pedido"
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Firma no válida (%s)"
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "ID de clave no válida (%s)"
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Falta firma (%s)"
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "declaración incorrecta del proxy en la línea de comandos\n"
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: no se puede leer el archivo rpm «%s»\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Disculpe, elección incorrecta, reinténtelo\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -868,20 +828,20 @@ msgstr ""
 "\n"
 "uso:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - imprime este mensaje de ayuda.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 "  --auto         - seleccionar un paquete en las elecciones "
 "automáticamente.\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
@@ -889,24 +849,24 @@ msgstr ""
 "  --test         - verificar si se puede llevar a cabo la instalación sin "
 "problemas.\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 "  --force        - fuerza invocación aunque no existan algunos paquetes.\n"
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - urpmi distribuido entre máquinas de alias.\n"
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - usar otra raíz para la instalación de rpm.\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -916,75 +876,65 @@ msgstr ""
 "distribución,\n"
 "                   útil para (des)instalar un chroot con la opción --root.\n"
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - modo informativo.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 "  -a             - selecciona todas los paquetes que coincidan con la "
 "expresión.\n"
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: opción desconocida «-%s», verifique el uso con --help\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr "paquetes desconocidos "
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "paquete desconocido "
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "quitar el paquete %s dañará su sistema"
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr "Nada que quitar"
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "Verificando para quitar los paquetes siguientes"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
 "Para satisfacer las dependencias, se quitarán los paquetes siguientes (%d MB)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (s/N) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "quitando %s"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr "Falló la desinstalación"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Disculpe, elección incorrecta, reinténtelo\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1001,22 +951,22 @@ msgstr ""
 "\n"
 "uso:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - usa sólo soporte de actualización.\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media         - usar sólo soportes dados, separados por comas.\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - no usar soportes dados, separados por coma.\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1024,19 +974,19 @@ msgstr ""
 "  --sortmedia    - clasificar soportes de acuerdo a subcadenas separadas por "
 "coma.\n"
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - usar la síntesis provista en vez de la base de datos de "
 "urpmi.\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - modo informativo.\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1047,88 +997,88 @@ msgstr ""
 "proporciona\n"
 "etiqueta en la línea de comandos, incompatible con modo interactivo)\n"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --uniq         - no imprime líneas idénticas.\n"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all           - imprime todas las etiquetas.\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group         - imprime etiqueta de grupo: group.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size          - imprime etiqueta de tamaño: size.\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --epoch        - imprime etiqueta de época: epoch.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary       - imprime etiqueta resumen: summary.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description   - imprime etiqueta de descripción: description.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr "  --sourcerpm    - imprime etiq. sourcerpm: rpm fuente.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr "  --packager     - imprime etiq. packager: quien lo empaquetó.\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr ""
 "  --buildhost    - imprime etiq. buildhost: máquina en la que se construyó.\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --url          - imprime etiq. url: url.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr "  --provides      - imprime etiq. provides: todo que proporciona.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr "  --requires      - imprime etiq. requires: todo que precisa.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files         - imprime etiq. archivos: todos archivos.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr "  --conflicts     - imprime etiq. conflicts: todos los conflictos.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr "  --obsoletes     - imprime etiq. obsoletes: todo lo obsoleto.\n"
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
@@ -1137,25 +1087,25 @@ msgstr ""
 "  --env          - usar entorno específico (típicamente para reportar\n"
 "                   bugs).\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
 "  -i             - ignora distinción entre mayús. y minús. en todos los "
 "patrones.\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - imprime versión, release y arquitectura con nombre.\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - incluye código Perl directamente como perl -e.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
@@ -1163,7 +1113,7 @@ msgstr ""
 "  -a             - operador binario Y, verdadero si ambas expresiones son "
 "verdaderas.\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
@@ -1171,24 +1121,24 @@ msgstr ""
 "  -o             - operador O binario, verdadero si una expresión es "
 "verdadera.\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - NO unario, verdadero si la expresión es falsa.\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
 "  (              - paréntesis izquierdo para abrir grupo de expresiones.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
 "  )              - paréntesis derecho para cerrar grupo de expresiones.\n"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
@@ -1197,12 +1147,12 @@ msgstr ""
 "callback es :\n"
 "%s\n"
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "uasando un entorno específico en %s\n"
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1219,14 +1169,14 @@ msgstr ""
 "\n"
 "uso:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - usar síntesis provista en lugar de base de datos de "
 "urpmi.\n"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
@@ -1234,7 +1184,7 @@ msgstr ""
 "  --auto-select  - seleccionar automáticamente paquetes para actualizar "
 "sistema.\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
@@ -1243,7 +1193,7 @@ msgstr ""
 "  --no-uninstall - nunca preguntar si desinstalar un paquete, cancelar la "
 "instalación.\n"
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1253,7 +1203,7 @@ msgstr ""
 "pedidos\n"
 "                   de paquetes que lleven a quitarlos.\n"
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1264,38 +1214,38 @@ msgstr ""
 "                   o instalar más paquetes dados,\n"
 "                   %d es el predeterminado.\n"
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 "  --split-length - tamaño de transacción pequeña, predeterminado es %d.\n"
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - forzar búsqueda difusa (lo mismo que -y).\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - sig. paquete es paquete fuente (igual que -s).\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - instalar sólo paquete de fuentes (ningún binario)\n"
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - quitar rpm del cache antes que nada.\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - mantener rpm no usado en cache.\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1304,7 +1254,7 @@ msgstr ""
 "  --allow-nodeps - permitir preguntar al usuario para instalar paquetes\n"
 "                   sin verificar las dependencias.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1313,7 +1263,7 @@ msgstr ""
 "  --allow-force  - permitir preguntar al usuario para instalar paquetes sin\n"
 "                   verificar las dependencias ni la integridad.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1323,22 +1273,22 @@ msgstr ""
 "distribución,\n"
 "                   útil para instalar un chroot con la opción --root.\n"
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - usa wget para recuperar archivos remotos.\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - usa curl para recuperar archivos remotos.\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - limitar la velocidad de descarga.\n"
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1348,7 +1298,7 @@ msgstr ""
 "parcialmente\n"
 "                   (--no-resume lo deshabilita, que es lo predeterminado).\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1357,7 +1307,7 @@ msgstr ""
 "  --proxy        - usar proxy HTTP especificado, se asume que el puerto es\n"
 "                   1080 por defecto (formato <hostproxy[:puerto]>).\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1366,7 +1316,7 @@ msgstr ""
 "  --proxy-user   - especificar usuario y contraseña para utilizar en la\n"
 "                   autenticación del proxy (formato <usuario:contraseña>).\n"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1375,12 +1325,12 @@ msgstr ""
 "  --bug          - emitir un reporte de bug en el directorio indicado\n"
 "                   por el argumento siguiente.\n"
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - usar la interfaz X.\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1389,7 +1339,7 @@ msgstr ""
 "  --best-output  - selecciona el mejor interfaz según el entorno:\n"
 "                   modo X o texto.\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1398,76 +1348,65 @@ msgstr ""
 "  --verify-rpm   - verificar la firma del rpm antes de la instalación.\n"
 "                   (--no-verify-rpm lo deshabilita, habilitado predet.).\n"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath   - ruta de exclusión separada por coma.\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - excluir archivos de documentación.\n"
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 "  -a             - selecciona todas coincidencias en línea de comando.\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 "  -p             - permite buscar en provides para encontrar paquete.\n"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -p             - no buscar en «provides» para encontrar paquete.\n"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - forzar búsqueda difusa (lo mismo que --fuzzy).\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s          - sig. paquete es paquete fuente (igual que --src).\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - modo silencioso.\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  se instalan los nombres o archivos rpm dados en línea de comandos.\n"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr "Elija ubicación para guardar archivo"
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "declaración incorrecta del proxy en la línea de comandos\n"
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: opción desconocida «-%s», verifique el uso con --help\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 "Lo que se puede hacer con archivos rpm binarios utilizando --install-src"
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1488,22 +1427,22 @@ msgstr ""
 "\n"
 "¿Que desea hacer?"
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "Nada"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr "Sí, deseo instalarlo"
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr "Guardar archivo"
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1519,12 +1458,12 @@ msgstr ""
 "\n"
 "Puede que prefiera sólo guardarlo. ¿Cuál es su elección?"
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, c-format
 msgid "Install it"
 msgstr "Instalarlo"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1533,42 +1472,42 @@ msgstr ""
 "El directorio [%s] ya existe, por favor use otro directorio para reportar "
 "errores o bórrelo"
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "No se puede crear el directorio [%s] para reporte de bugs"
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Sólo el superusuario está autorizado a instalar paquetes"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "Uno de los paquetes siguientes es necesario para instalar %s:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Uno de los paquetes siguientes es necesario:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "¿Qué elige? (1-%d)"
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "Instalación de paquete..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "Inicializando..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1577,12 +1516,12 @@ msgstr ""
 "No se puede instalar algún paquete pedido:\n"
 "%s"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr "¿está de acuerdo?"
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1593,7 +1532,7 @@ msgstr ""
 "siguientes para poder actualizar otros:\n"
 "%s\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1602,15 +1541,15 @@ msgstr ""
 "Se tienen que quitar los paquetes siguientes para poder actualizar otros:\n"
 "%s"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
 "Para resolver las dependencias, se instalarán los paquetes siguientes (%d MB)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1619,37 +1558,47 @@ msgstr ""
 "Necesita ser root para instalar las dependencias siguientes:\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "no se pueden obtener los paquetes fuente, abortando"
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Por favor, inserte el soporte denominado «%s» en el dispositivo [%s]"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Presione «Intro» cuando esté listo..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Descargando paquete `%s'..."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% de %s completado, ETA = %s, velocidad = %s"
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% completado, velocidad = %s"
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Los siguientes paquetes contienen firmas no válidas"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "¿Desea continuar con la instalación?"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1660,57 +1609,57 @@ msgstr ""
 "%s\n"
 "Puede querer actualizar su base de datos de urpmi"
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "Falló la instalación"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr "distribuyendo %s"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr "instalando %s"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instalando paquete `%s' (%s/%s)..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "¿Intentar de instalar sin verificar las dependencias? (s/N) "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "¿Intentar con más fuerza la instalación (--force)? (s/N) "
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "fallaron %d transacciones de instalación"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "Es posible la instalación"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "ya está todo instalado"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr "reiniciando urpmi"
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1735,22 +1684,22 @@ msgstr ""
 "\n"
 "y [opciones] es uno o varios de\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - crea sólo soporte de actualización.\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr "  --probe-synthesis - intentar y encontrar archivo synthesis.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr "  --probe-hdlist - intentar encontrar y usar archivo hdlist.\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
@@ -1758,7 +1707,7 @@ msgid ""
 msgstr ""
 "  --no-probe     - no intentar encontrar archivos synthesis o hdlist.\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -1767,7 +1716,7 @@ msgstr ""
 "  --distrib      - crear automáticamente todos los soportes desde un\n"
 "                   soporte de instalación.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1778,7 +1727,7 @@ msgstr ""
 "                   una distribución, XXX puede ser main, contrib, updates o\n"
 "                   cualquier otra cosa que haya sido configurada ;-)\n"
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1787,7 +1736,7 @@ msgstr ""
 "  --from         - usar url especificada para la lista de réplicas, la\n"
 "                   predeterminada es %s\n"
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1798,7 +1747,7 @@ msgstr ""
 "                   se toma la versión de la distribución indicada por el\n"
 "                   paquete mandrake-release instalado.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
@@ -1807,7 +1756,7 @@ msgstr ""
 "  --arch         - usar arquitectura especificada, lo predeterminado es la\n"
 "                   arquitectura del paquete mandrake-release instalado.\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
@@ -1816,73 +1765,52 @@ msgstr ""
 "  --virtual      - crear soporte virtual que siempre está actualizado,\n"
 "                   sólo se permite protocolo file://.\n"
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - deshabilitar la prueba MD5SUM sobre el archivo.\n"
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - limpia dir. encabezados de cache.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - fuerza generación de archivos hdlist.\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"opciones desconocidas «%s»\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "no se pueden añadir actualizaciones de una distribución cooker\n"
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "obteniendo sitios de réplica en %s ..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"no es necesario dar <ruta relativa de hdlist> con --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "no es necesario dar <ruta relativa de hdlist> con --distrib"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "no se puede actualizar soporte «%s»\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"falta <ruta relativa de hdlist>\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "falta <ruta relativa de hdlist>\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"falta «with» para soporte de red\n"
+msgid "`with' missing for network media\n"
+msgstr "falta «with» para soporte de red\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "no se puede crear soporte «%s»\n"
@@ -1901,6 +1829,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - selecciona todos los soportes.\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"opciones desconocidas «%s»\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1915,7 +1852,7 @@ msgstr ""
 "falta la entrada a quitar\n"
 "(una de %s)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1924,27 +1861,27 @@ msgstr ""
 "uso: urpmi.update [opciones] <nombre> ...\n"
 "donde <nombre> es nombre de soporte para actualizar.\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - actualizar sólo el soporte de actualización.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr "  --force-key    - forzar actualización de clave gpg.\n"
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - selecciona todos los soportes no extraíbles.\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "nada para actualizar (use urpmi.addmedia para agregar un soporte)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1953,7 +1890,7 @@ msgstr ""
 "falta la entrada a actualizar\n"
 "(una de %s)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1970,22 +1907,22 @@ msgstr ""
 "\n"
 "uso:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - lista los paquetes disponibles.\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - lista los soportes disponibles.\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - lista los soportes disponibles junto con sus URL.\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
@@ -1993,18 +1930,18 @@ msgstr ""
 "  --dump-config  - volcar la configuración en forma de argumento para urpmi."
 "addmedia.\n"
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 "  --list-nodes   - lista los nodos disponibles cuando se usa --parallel.\n"
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - lista los alias paralelo disponibles.\n"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
@@ -2013,7 +1950,7 @@ msgstr ""
 "  --headers      - extrae cabeceras para paquetes listados desde la\n"
 "                   bd de urpmi a stdout (sólo root).\n"
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
@@ -2021,7 +1958,7 @@ msgstr ""
 "  --sources      - da todos los paquetes fuentes antes de bajar (sólo "
 "root).\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
@@ -2031,17 +1968,17 @@ msgstr ""
 "distribución.\n"
 "                   Esto permite consultar una distro.\n"
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - imprimir el registro de cambios.\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - extiende consulta a las dependencias del paquete.\n"
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -2050,59 +1987,113 @@ msgstr ""
 "  -u             - quitar paquete si ya está instalada una versión más "
 "reciente.\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - completar salida con paquete(s) a quitar.\n"
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - búsqueda inversa de lo que necesita el paquete.\n"
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 "  -i             - imprimir información útil en formato legible para las "
 "personas.\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - imprimir los grupos junto con los nombres.\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - imprimir versión y revisión junto con el nombre.\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - lista los archivos en el paquete.\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 "  los nombres o archivos rpm dados en línea de comandos se consultan.\n"
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: opción desconocida «-%s», verifique el uso con --help\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: no se puede leer el archivo rpm «%s»\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes sólo se puede utilizar con --parallel"
 
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "¡¡¡programa para bajar de la red «%s» desconocido!!!\n"
+
+#~ msgid "copy failed: %s"
+#~ msgstr "falló la copia: %s"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "no se encuentra wget\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "wget falló: salió con %d o señal %d\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "falta curl\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "curl falló: salió con %d o señal %d\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "falta rsync\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "rsync falló: terminó con %d o señal %d\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "falta ssh\n"
+
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpme: opción desconocida «-%s», verifique el uso con --help\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmi: opción desconocida «-%s», verifique el uso con --help\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr ""
+#~ "Para resolver las dependencias, se instalarán los paquetes siguientes (%d "
+#~ "MB)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "no es necesario dar <ruta relativa de hdlist> con --distrib"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "falta <ruta relativa de hdlist>\n"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "falta «with» para soporte de red\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmq: opción desconocida «-%s», verifique el uso con --help\n"
+
 #~ msgid "no webfetch (curl or wget currently) found\n"
 #~ msgstr "no se encontró webfetch (curl o wget, por ejemplo)\n"
 
diff --git a/po/et.po b/po/et.po
index 36988b45..7fecf1cf 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-et\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2004-03-13 23:02+0300\n"
 "Last-Translator: Marek Laane <bald@online.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -48,22 +48,22 @@ msgstr ""
 "Automaatne pakettide paigaldamine...\n"
 "Soovisite paigaldada paketti %s\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "Kas sobib?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "Olgu"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Loobu"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (J/e) "
@@ -73,7 +73,7 @@ msgstr " (J/e) "
 msgid "%s: command not found\n"
 msgstr "%s: ei tunne seda käsku\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
@@ -82,115 +82,54 @@ msgstr ""
 "kasutamine: %s [võtmed]\n"
 "kus [võtmed] on\n"
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - näitab seda abiteadet.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "   -g [grupp]     - piirab tulemused määratud grupiga.\n"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, c-format
 msgid "                    defaults is %s.\n"
 msgstr "                    vaikimisi on %s.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Tundmatu veebitõmbaja '%s' !!!\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "tundmatu protokoll %s jaoks"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "veebitõmbajat ei leitud, toetatud on programm %s\n"
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "ei suuda käsitleda protokolli: %s"
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "kopeerimine ebaõnnestus: %s"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "wget puudub\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget ebaõnnestus: lõpetas teatega %d või signaaliga %d\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "curl puudub\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl ebaõnnestus: lõpetas teatega %d või signaaliga %d\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "rsync puudub\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "rsync ebaõnnestus: lõpetas teatega %d või signaaliga %d\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "ssh puudub\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% %s-st tehtud, aega jäänud (olet.) = %s, kiirus = %s"
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% tehtud, kiirus = %s"
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...tõmbamine ebaõnnestus: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "süntaksiviga seadistustefailis real %s"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 "andmekandja \"%s\" püüab kasutada juba kasutusel hdlisti, seda eiratakse"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 "andmekandja \"%s\" püüab kasutada juba kasutusel nimekirja, seda eiratakse"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -199,40 +138,40 @@ msgstr ""
 "andmekandjat \"%s\" ei saa arvestada, sest selle nimekirjafaili kasutab juba "
 "muu andmekandja"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 "nime \"%s\" kasutamine nimetul andmekandjal pole võimalik, sest nimi on juba "
 "kasutusel"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 "andmekandjat \"%s\" ei saa arvestada, sest sel puudub nimekirjafail [%s]"
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "andmekandja määramine hdlist-failile [%s] ebaõnnestus"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "ligipääs \"%s\" hdlist failile ebaõnnestus, andmekandjat eiratakse"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "ligipääs \"%s\" nimekirjafailile ebaõnnestus, andmekandjat eiratakse"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "püütakse vältida olemasolevat andmekandjat \"%s\""
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -241,92 +180,92 @@ msgstr ""
 "virtuaalsel andmekandjal \"%s\" ei peaks olema määratud hdlisti või "
 "nimekirjafaili, seda eiratakse"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "virtuaalsel andmekandjal \"%s\" peaks olema selge URL, seda eiratakse"
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "ei leitud \"%s\" hdlist faili, andmekandjat eiratakse"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "ei leitud \"%s\" nimekirjafaili, andmekandjat eiratakse"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "\"%s\" ebaühtlane nimekirjafail, andmekandjat eiratakse"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "\"%s\" nimekirjafaili uurimine ebaõnnestus, andmekandjat eiratakse"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "eemaldataval andmekandjal \"%s\" on liiga palju haakepunkte"
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "eemaldatavat andmekandjat käsitletakse kui \"%s\""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "kasutatakse teist eemaldatavat seadet [%s] \"%s\" jaoks"
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "eemaldatava andmekandja \"%s\" asukoha hankimine ebaõnnestus"
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "seadistustefaili [%s] kirjutamine ebaõnnestus"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "seadistustefaili [%s] kirjutamine"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "Paralleelresiimi ei saa kasutada koos võtmega use-distrib"
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "\"%s\" parsimine failis [%s] ebaõnnestus"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "paralleelkäitleja uurimine failis [%s]"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "leiti paralleelkäitleja sõlmedele: %s"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "seostatava andmekandja kasutamine paralleelresiimis: %s"
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "paralleelvõtme \"%s\" kasutamine ebaõnnestus"
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -335,90 +274,90 @@ msgstr ""
 "võtit --synthesis ei saa kasutada võtmega --media, --excludemedia, --"
 "sortmedia, --update või --parallel"
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "sünteesifaili [%s] uurimine"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "hdlist faili [%s] uurimine"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "virtuaalne andmekandja \"%s\" ei ole kohalik, seda eiratakse"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "probleem andmekandja \"%s\" hdlist või sünteesifaili lugemisel"
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "teistkordne sõltuvuste arvutamine\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "pakett %s jäetakse vahele"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "paketti %s ei uuendata, seda saab ainult paigaldada"
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "rpmdb avamine ebaõnnestus"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "andmekandja \"%s\" on juba olemas"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr "virtuaalne andmekandja peab olema kohalik"
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "lisati andmekandja %s"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "ligipääs esimesele paigaldus-andmekandjale ebaõnnestus"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "faili hdlists kopeerimine..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "...kopeerimine ebaõnnestus"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "...kopeerimine tehtud"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
@@ -427,43 +366,49 @@ msgstr ""
 "ligpääs esimesele paigaldus-andmekandjale ebaõnnestus (ei leitud faili "
 "Mandrake/base/hdlists)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "hdlists faili tõmbamine..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "...tõmbamine tehtud"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...tõmbamine ebaõnnestus: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "vigane hdlisti kirjeldus \"%s\" failis hdlists"
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "püüti valida olematut andmekandjat \"%s\""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "mitme andmekandja valik: %s"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "andmekandja \"%s\" eemaldamine"
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -473,7 +418,7 @@ msgstr ""
 "andmekandjat \"%s\" ei õnnestunud leida,\n"
 "mis võib juhtuda siis, kui andmekandjat luues ühendati kataloog käsitsi."
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -482,222 +427,222 @@ msgstr ""
 "virtuaalsel andmekandjal \"%s\" peaks olema kehtiv hdlist või süntees, seda "
 "eiratakse"
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "\"%s\" kirjelduste faili kopeerimine..."
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "olemasoleva allika hdlisti (või sünteesi) MD5SUM arvutamine"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "MD5SUM faili uurimine"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "\"%s\" allika hdlisti (või sünteesi) kopeerimine..."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "[%s] kopeerimine ebaõnnestus (fail on kahtlaselt väike)"
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "kopeeritud allika hdlisti (või sünteesi) MD5SUM arvutamine"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "[%s] kopeerimine ebaõnnestus (MD5SUM ei klapi)"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "probleem andmekandja \"%s\" sünteesifaili lugemisel"
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "[%s] rpm failide lugemine"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "[%s] rpm failide lugemine ebaõnnestus: %s"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "[%s] ei sisalda rpm faile"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "\"%s\" allika hdlisti (või sünteesi) tõmbamine..."
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "leiti kontrollitud hdlist (või süntees) %s"
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "tõmmatud allika hdlisti (või sünteesi) MD5SUM arvutamine"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr "MD5SUM ei klapi"
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "allika hdlisti (või sünteesi) tõmbamine ebaõnnestus"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "andmekandjale \"%s\" ei leitud hdlist faili"
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "fail [%s] on juba kasutusel samal andmekandjal \"%s\""
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "\"%s\" hdlist faili analüüs ebaõnnestus"
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "\"%s\" nimekirjafaili kirjutamine ebaõnnestus"
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "andmekandja \"%s\" nimekirjafaili kirjutamine"
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "\"%s\" nimekirjafaili ei kirjutatud midagi"
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "\"%s\" avaliku võtme faili uurimine..."
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...imporditi võti %s \"%s\" avaliku võtme failist"
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "\"%s\" avaliku võtme faili import ebaõnnestus"
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "päiste lugemine andmekandjalt \"%s\""
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "hdlist [%s] loomine"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "loodi hdlist sünteesifail andmekandjale \"%s\""
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "puhvris leiti %d päis(t)"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "puhvrist eemaldati %d iganenud päis(t)"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "%s haakimine"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "%s lahutamine"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "depslisti kanti %s kirjet"
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "depslisti ei kantud ühtegi kirjet"
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "vigane rpm-faili nimi [%s]"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "rpm faili [%s] tõmbamine..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "ligipääs rpm failile [%s] ebaõnnestus"
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "rpm faili registreerimine ebaõnnestus"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "viga kohalike pakettide registreerimisel"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "paketti nimega %s ei ole"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "%s sisaldub järgmistes pakettides: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "mitu paketti kannab üht ja sama rpm faili nime \"%s\""
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "[%s] analüüsimine väärtusel \"%s\" ebaõnnestus"
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -706,144 +651,159 @@ msgstr ""
 "andmekandja \"%s\" kasutab vigast nimekirjafaili:\n"
 "  peegel ei ole võib-olla uuendatud, proovige mõnda muud meetodit"
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "andmekandja \"%s\" ei määra ühtegi rpm failide asukohta"
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "paketti %s ei leitud."
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi andmebaas on lukus"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "andmekandja \"%s\" ei ole valitud"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "rpm faili [%s] lugemine andmekandjalt \"%s\" ebaõnnestus"
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "andmekandja \"%s\" on kirjas eemaldatavana, aga ei ole seda mitte"
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "ligipääs andmekandjale \"%s\" ebaõnnestus"
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "vigane sisend: [%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "rpm failide tõmbamine andmekandjalt \"%s\"..."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "Valmistun..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "tehinguks kasutatakse protsessi %d"
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 "tehing %s paigaldamiseks loodud (eemaldus=%d, paigaldus=%d, uuendus=%d)"
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr "tehingu loomine ebaõnnestus"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "paketi %s eemaldamine"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "paketi %s eemaldamine ebaõnnestus"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "paketi %s lisamine (id=%d, eid=%d, uuendus=%d, fail=%s)"
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "paketi %s paigaldamine ebaõnnestus"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "puuduva %s tõttu"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "rahuldamata %s tõttu"
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr "püüan välja pakkuda %s"
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr "säilitamaks %s"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "paigaldamaks %s"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "konflikti tõttu %s-ga"
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr "soovimata"
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Vigane signatuur (%s)"
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "Vigane võtme ID (%s)"
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Puudub signatuur (%s)"
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "käsureal on määratud vigane vahendaja\n"
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: rpm faili \"%s\" lugemine ebaõnnestus\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Vabandust, selline valik ei ole lubatud. Proovige uuesti\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -860,26 +820,26 @@ msgstr ""
 "\n"
 "kasutamine:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - näitab seda abiteadet.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 "  --auto         - valib automaatselt ühe paketi, kui võimalusi on mitu.\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 "  --test         - kontrollitakse, kas paigaldus on korrektselt võimalik.\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
@@ -887,19 +847,19 @@ msgstr ""
 "  --force        - käivitatakse ka siis, kui mõnda nõutud paketti ei ole "
 "olemas.\n"
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 "  --parallel     - jagatud urpmi käivitamine üle mitme aliasega määratud "
 "masina.\n"
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - muu baasi kasutamine rpm-ide paigaldamisel.\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -909,72 +869,62 @@ msgstr ""
 "                   kasulik chroot paigaldamiseks/eemaldamiseks võtmega --"
 "root.\n"
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - selgitav resiim.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - valib kõik käsureaga sobivad paketid.\n"
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: tundmatu võti \"-%s\", vaadake igaks juhuks --help\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr "tundmatud paketid"
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "tundmatu pakett"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "paketi %s eemaldamine halvab Teie süsteemi"
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr "Pole midagi eemaldada"
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "Kontrollitakse, kas on võimalik eemaldada järgmised paketid"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr "Sõltuvuste lahendamiseks tuleb eemaldada järgmised paketid (%d MB)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (j/E) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "%s eemaldamine"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr "Eemaldamine ebaõnnestus"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Vabandust, selline valik ei ole lubatud. Proovige uuesti\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -991,26 +941,26 @@ msgstr ""
 "\n"
 "kasutamine:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - kasutatakse ainult uuendus-andmekandjat.\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 "  --media        - kasutatakse ainult määratud andmekandjaid (eraldajaks "
 "koma).\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 "  --excludemedia        - ei kasutata määratud andmekandjaid (eraldajaks "
 "koma).\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1018,17 +968,17 @@ msgstr ""
 "  --sortmedia    - sorteerib andmekandjad alamstringide põhjal (eraldajaks "
 "koma).\n"
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr "  --synthesis    - kasutab sünteesi urpmi andmebaasi asemel.\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - selgitav resiim.\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1038,87 +988,87 @@ msgstr ""
 "  --quiet        - välja nime ei näidata (vaikimisi, kui välja ei ole antud\n"
 "                    käsureal, mis ei sobi interaktiivsesse resiimi).\n"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --uniq         - ei näidata ühesuguseid ridu.\n"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all          - näitab kõiki välju.\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group        - näitab välja group: grupp.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size         - näitab välja size: suurus.\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --epoch        - näitab välja epoch: epohh.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary      - näitab välja summary: kokkuvõte.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description  - näitab välja description: kirjeldus.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr "  --sourcerpm    - näitab välja sourcerpm: lähtekoodi rpm.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr "  --packager     - näitab välja packager: paketi valmistaja.\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr "  --buildhost    - näitab välja buildhost: valmistajamasin.\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --url          - näitab välja url: URL.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr "  --provides     - näitab välja provides: kõik pakutavad.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr "  --requires     - näitab välja requires: kõik nõutavad.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files        - näitab välja files: kõik failid.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr "  --conflicts    - näitab välja conflicts: kõik konfliktid.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr "  --obsoletes    - näitab välja obsoletes: kõik iganenud.\n"
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
@@ -1127,24 +1077,24 @@ msgstr ""
 "  --env          - kasutatakse spetsiifilist keskkonda (tavaliselt\n"
 "                   vearaportideks).\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr "  -i             - tõstutundetu igas olukorras.\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - näitab koos nimega versiooni, väljalaset ja "
 "arhitektuuri.\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - kaasab otseselt perli koodi kui perl -e.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
@@ -1152,29 +1102,29 @@ msgstr ""
 "  -a             - binaaroperaator AND: tõene, kui mõlemad avaldised on "
 "tõesed.\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 "  -o             - binaaroperaator OR: tõene, kui üks avaldis on tõene.\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - binaaroperaator NOT: tõene, kui avaldis on väär.\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr "  (              - vasakpoolne sulg rühmaavaldise alustamiseks.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr "  )              - parempoolne sulg rühmaavaldise lõpetamiseks.\n"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
@@ -1183,12 +1133,12 @@ msgstr ""
 "väljakutse on :\n"
 "%s\n"
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "spetsiifilise keskkonna kasutamine %s -l\n"
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1205,18 +1155,18 @@ msgstr ""
 "\n"
 "kasutamine:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - kasutatakse sünteesi urpmi andmebaasi asemel.\n"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - valib automaatselt paketid süsteemi uuendamiseks.\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
@@ -1225,7 +1175,7 @@ msgstr ""
 "  --no-uninstall - kunagi ei paluta paketti eemaldada, paigaldusest "
 "loobuda.\n"
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1234,7 +1184,7 @@ msgstr ""
 "  --keep         - säilitab võimalusel olemasolevad paketid, lükkab tagasi\n"
 "                   soovitud paketid, mis toovad kaasa eemaldamise.\n"
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1245,39 +1195,39 @@ msgstr ""
 "                   uuendatakse enam kui määratud arv pakette,\n"
 "                   vaikimisi on see %d.\n"
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - väikese tehingu pikkus, vaikimisi %d.\n"
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - lubab ebatäpset otsingut (sama, mis -y).\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 "  --src          - järgmine pakett on lähtetekstipakett (sama, mis -s).\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 "  --install-src  - paigaldab ainult lähtetekstipaketi (mitte binaarpaketi).\n"
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - eemaldab enne muud tegevust rpm-i puhvrist.\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - säilitab puhvris mittekasutatud rpm-i.\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1286,7 +1236,7 @@ msgstr ""
 "  --allow-nodeps - lubab kasutajal paigaldamise\n"
 "                   pakettide sõltuvusi kontrollimata.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1295,7 +1245,7 @@ msgstr ""
 "  --allow-force  - lubab kasutajal paigaldada pakette ilma\n"
 "                   sõltuvusi ja sobivust kontrollimata.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1304,22 +1254,22 @@ msgstr ""
 "  --use-distrib  - seadistab urpmi lennult distributsioonipuu põhjal,\n"
 "                   kasulik chroot paigaldamiseks võtmega --root.\n"
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - wget kasutamine kaugfailide tõmbamiseks.\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - curl kasutamine kaugfailide tõmbamiseks.\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - piirab allalaadimiskiirust.\n"
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1328,7 +1278,7 @@ msgstr ""
 "  --resume       - taasalustab osaliselt alla tõmmatud failide tõmbamist\n"
 "                   (--no-resume tühistab selle, vaikimisi on väljas).\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1338,7 +1288,7 @@ msgstr ""
 "eeldatavalt\n"
 "                   vaikimisi 1080 (vorming on <proxyhost[:port]>).\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1347,7 +1297,7 @@ msgstr ""
 "  --proxy-user   - määrab kasutajanime ja parooli vahendaja\n"
 "                   autentimiseks (vorming: <kasutajanimi:parool>).\n"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1356,12 +1306,12 @@ msgstr ""
 "  --bug          - väljastab vearaporti kataloogi, mis on ära näidatud\n"
 "                   järgnevas argumendis.\n"
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - kasutatakse X-i.\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1370,7 +1320,7 @@ msgstr ""
 "  --best-output  - valib vastavalt keskkonnale parima resiimi: kas X või\n"
 "                   tekstiresiim.\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1379,74 +1329,63 @@ msgstr ""
 "  --verify-rpm   - kontrollib rpm signatuuri enne paigaldust\n"
 "                   (--no-verify-rpm tühistab selle, vaikimisi on sees).\n"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - eirab asukohta (või asukohti, eraldajaks koma).\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - jätab välja dokumentatsioonifailid.\n"
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - valib kõik käsureaga sobivad.\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - lubab pakette otsida pakutavate seas.\n"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - ei luba pakettide otsimist pakutavate seas.\n"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - lubab ebatäpset otsingut (sama, mis --fuzzy).\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 "  -s             - järgmine pakett on lähtetekstipakett (sama, mis --src).\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - vaikne resiim.\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  paigaldatakse käsureal antud nimed või rpm-failid.\n"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr "Valige faili salvestamise koht"
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "käsureal on määratud vigane vahendaja\n"
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: tundmatu võti \"-%s\", vaadake igaks juhuks --help\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr "Mida teha binaarsete rpm failidega võtme --install-src kasutamisel"
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1467,22 +1406,22 @@ msgstr ""
 "\n"
 "Mida nüüd ette võtta?"
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "Mitte midagi"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr "Paigalda"
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr "Salvesta fail"
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1497,12 +1436,12 @@ msgstr ""
 "\n"
 "Võib-olla soovite siiski seda lihtsalt salvestada? Mida ette võtta?"
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, c-format
 msgid "Install it"
 msgstr "Paigalda"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1511,42 +1450,42 @@ msgstr ""
 "Kataloog [%s] on juba olemas, palun kasutage vearaportideks muud kataloogi "
 "või kustutage see"
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Kataloogi [%s] loomine vearaportideks ebaõnnestus"
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Pakette võib paigaldada ainult administraator"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "%s paigaldamiseks on vajalik üks järgnevatest pakettidest:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Vajalik on üks järgnevatest pakettidest:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Millise valite? (1-%d) "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "Paketi paigaldamine..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "Initsialiseerimine..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1555,12 +1494,12 @@ msgstr ""
 "Mõnda soovitud paketti ei õnnestunud paigaldada:\n"
 "%s"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr "Kas olete nõus?"
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1571,7 +1510,7 @@ msgstr ""
 "järgmised paketid:\n"
 "%s\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1580,14 +1519,14 @@ msgstr ""
 "Teiste uuendamiseks tuleb eemaldada järgmised paketid:\n"
 "%s"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr "Sõltuvuste lahendamiseks paigaldatakse järgmised paketid (%d MB)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1596,37 +1535,47 @@ msgstr ""
 "Järgmiste sõltuvuste paigaldamiseks peate olema administraator:\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "pakette ei õnnestunud hankida, katkestatakse"
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Palun asetage andmekandja nimega \"%s\" seadmesse [%s]"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Vajutage Enter, kui see on tehtud..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Paketi '%s' allalaadimine..."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% %s-st tehtud, aega jäänud (olet.) = %s, kiirus = %s"
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% tehtud, kiirus = %s"
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Järgmistel pakettidel on vigane signatuur"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Kas jätkata paigaldusega?"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1637,57 +1586,57 @@ msgstr ""
 "%s\n"
 "Te võiksite ehk uuendada urpmi andmebaasi"
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "Paigaldamine ebaõnnestus"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr "%s jaotamine"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr "%s paigaldamine"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Paketi '%s' paigaldamine (%s/%s)..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Kas proovida paigaldust ilma sõltuvusi kontrollimata? (j/E)"
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Kas proovida paigaldust veel jõulisemalt (--force)? (j/E) "
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d paigaldamistehingut ebaõnnestus"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "Paigaldamine on võimalik"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "Kõik on juba paigaldatud"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr "urpmi taaskäivitamine"
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1712,22 +1661,22 @@ msgstr ""
 "\n"
 "ja [võti] on üks järgmistest\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - loob uuendatava andmekandja.\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr "  --probe-synthesis             - püütakse kasutada sünteesifaili.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr "  --probe-hdlist - püütakse kasutada hdlist-faili.\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
@@ -1736,7 +1685,7 @@ msgstr ""
 "  --no-probe     - ei püüta kasutada sünteesi-\n"
 "                   või hdlist-faili.\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -1744,7 +1693,7 @@ msgid ""
 msgstr ""
 "  --distrib      - loob automaatselt kõik andmekandjad paigalduskohalt.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1755,7 +1704,7 @@ msgstr ""
 "                    osale XXX, kus XXX võib olla main, contrib, updates\n"
 "                    või mis tahes muu seadistatud määratlus ;-)\n"
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1764,7 +1713,7 @@ msgstr ""
 "  --from         - kasutab määratud URL-i peeglite loendi jaoks, vaikimisi\n"
 "                   on see %s\n"
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1774,7 +1723,7 @@ msgstr ""
 "  --version      - kasutab määratud versiooni, vaikimisi on see\n"
 "                   paigaldatud paketi 'mandrake-release' versioon.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
@@ -1783,7 +1732,7 @@ msgstr ""
 "  --arch         - kasutab määratud arhitektuuri, vaikimisi on see\n"
 "                   paigaldatud paketi 'mandrake-release' arhitektuur.\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
@@ -1792,73 +1741,53 @@ msgstr ""
 "  --virtual      - loob virtuaalse andmekandja, mis on alati värske,\n"
 "                   lubatud on ainult protokoll file://.\n"
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - keelatakse faili MD5SUM kontroll.\n"
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - puhastab päistepuhvri kataloogi.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - sunnib genereerima hdlist-faile.\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"tundmatu võti '%s'\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "cookeri distributsiooni uuenduste lisamine ebaõnnestus\n"
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "peeglite tõmbamine asukohast %s ..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr ""
-"%s\n"
 "võtme --distrib puhul puudub vajadus anda <suhteline tee hdlist juurde>"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "andmekandja \"%s\" uuendamine ebaõnnestus\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"Puudub <suhteline tee hdlist juurde>\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "Puudub <suhteline tee hdlist juurde>\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"võrguandmekandjal peab olema määratud `with'\n"
+msgid "`with' missing for network media\n"
+msgstr "võrguandmekandjal peab olema määratud `with'\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "andmekandja \"%s\" loomine ebaõnnestus\n"
@@ -1877,6 +1806,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - valib kõik andmekandjad.\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"tundmatu võti '%s'\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1891,7 +1829,7 @@ msgstr ""
 "puudub eemaldatava kirje nimi\n"
 "(võimalikud: %s)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1900,27 +1838,27 @@ msgstr ""
 "kasutamine: urpmi.update [võti] <nimi> ...\n"
 "kus <nimi> on uuendatava andmekandja nimi.\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - uuendab ainult uuendus-andmekandjat.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr "  --force-key    - sunnib uuendama gpg võtit.\n"
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - valib kõik mitte-eemaldatavad andmekandjad.\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "ei ole midagi uuendada (andmekandja lisamiskäsk: urpmi.addmedia)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1929,7 +1867,7 @@ msgstr ""
 "puudub uuendatava kirje nimi\n"
 "(võimalikud: %s)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1946,41 +1884,41 @@ msgstr ""
 "\n"
 "kasutamine:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - näitab saadaolevaid pakette.\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - näitab saadaolevaid andmekandjaid.\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - näitab saadaolevaid andmekandjaid URL-idega.\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 "  --dump-config  - seadistusest tehakse tõmmis kujul urpmi.addmedia võti.\n"
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 "  --list-nodes   - näitab saadaolevaid sõlmi, kui kasutatakse võtit --"
 "parallel.\n"
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - näitab saadaolevaid aliaseid.\n"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
@@ -1990,7 +1928,7 @@ msgstr ""
 "standardväljundisse\n"
 "                   (ainult administraator).\n"
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
@@ -1998,7 +1936,7 @@ msgstr ""
 "  --sources      - näitab enne allalaadimist kõiki lähtetekstipakette "
 "(ainult administraator).\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
@@ -2007,17 +1945,17 @@ msgstr ""
 "  --use-distrib  - seadistab urpmi lennult distributsioonipuu põhjal.\n"
 "                   Võimaldab esitada päringu distributsiooni kohta.\n"
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - näitab muutuste logi.\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - laiendab päringut paketi sõltuvustele.\n"
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -2025,53 +1963,105 @@ msgid ""
 msgstr ""
 "  -u             - eemaldab paketi, kui uuem versioon on juba paigaldatud.\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - täielik väljund eemaldatavate pakettidega.\n"
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - kohandab otsingu sellele, mida pakett nõuab.\n"
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 "  -i             - näitab kasulikku infot ka inimesele arusaadaval kujul.\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - näitab koos nimega ka gruppi.\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - näitab koos nimega ka versiooni ja väljalaset.\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - näitab faile paketis.\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  päringu esitamine käsureal antud nimede või rpm-failide kohta.\n"
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: tundmatu võti \"-%s\", vaadake igaks juhuks --help\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: rpm faili \"%s\" lugemine ebaõnnestus\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "võtit --list-nodes saab kasutada ainult koos võtmega --parallel"
+
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "Tundmatu veebitõmbaja '%s' !!!\n"
+
+#~ msgid "copy failed: %s"
+#~ msgstr "kopeerimine ebaõnnestus: %s"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "wget puudub\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "wget ebaõnnestus: lõpetas teatega %d või signaaliga %d\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "curl puudub\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "curl ebaõnnestus: lõpetas teatega %d või signaaliga %d\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "rsync puudub\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "rsync ebaõnnestus: lõpetas teatega %d või signaaliga %d\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "ssh puudub\n"
+
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpme: tundmatu võti \"-%s\", vaadake igaks juhuks --help\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmi: tundmatu võti \"-%s\", vaadake igaks juhuks --help\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr "Sõltuvuste lahendamiseks paigaldatakse järgmised paketid (%d MB)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "võtme --distrib puhul puudub vajadus anda <suhteline tee hdlist juurde>"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "Puudub <suhteline tee hdlist juurde>\n"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "võrguandmekandjal peab olema määratud `with'\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmq: tundmatu võti \"-%s\", vaadake igaks juhuks --help\n"
diff --git a/po/eu.po b/po/eu.po
index f356c6d8..50879a32 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2004-03-08 11:22GMT\n"
 "Last-Translator: Hizkuntza Politikarako Sailburuordetza <hizpol@ej-gv.es>\n"
 "Language-Team: basque <itzulpena@euskalgnu.org>\n"
@@ -50,22 +50,22 @@ msgstr ""
 "Paketeen instalazio automatikoa...\n"
 "%s paketea instalatzea eskatu duzu\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "Zuzena da?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "Ados"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Utzi"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (B/e) "
@@ -75,7 +75,7 @@ msgstr " (B/e) "
 msgid "%s: command not found\n"
 msgstr "%s: komandoa ez da aurkitu\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
@@ -84,117 +84,56 @@ msgstr ""
 "erabilera: %s [aukerak]\n"
 "[aukerak] hemengoak dira\n"
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - laguntza-mezu hau inprimatzen du.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "   -g [taldea]     - emaitzak talde jakin batera murrizten ditu.\n"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, c-format
 msgid "                    defaults is %s.\n"
 msgstr "                    lehenetsia %s da.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "webfetch ezezaguna `%s' !!!\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "%s(e)rako protokolo ezezaguna definitu da"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "webfetch ez da aurkitu, webfetch hauek onartzen dira: %s\n"
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "ezin da protokoloa maneiatu: %s"
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "kopia honek huts egin du: %s"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "wget ez dago\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget-ek huts egin du: %d(r)ekin edo %d seinalearekin irten da\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "curl ez dago\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl-ek huts egin du: %d(r)ekin edo %d seinalearekin irten da\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "rsync ez dago\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "rsync-ek huts egin du: %d(r)ekin edo %d seinalearekin irten da\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "ssh ez dago\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% / %s eginda, ETA = %s, abiadura = %s"
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% eginda, abiadura = %s"
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...berreskuratzeak huts egin du: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "sintaxi-errorea konfigurazio-fitxategiaren %s lerroan"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 "\"%s\" euskarria dagoeneko erabilita dagoen hdlist bat erabiltzen saiatzen "
 "ari da, euskarriari ez ikusi egingo zaio"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 "\"%s\" euskarria dagoeneko erabilita dagoen zerrenda bat erabiltzen saiatzen "
 "ari da, euskarriari ez ikusi egingo zaio"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -203,43 +142,43 @@ msgstr ""
 "ezin da \"%s\" euskarriaren ardura hartu, zerrenda-fitxategia beste euskarri "
 "batek erabili duelako"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 "ezin da izen gabeko euskarrirako \"%s\" izena erabili, dagoeneko erabilita "
 "dagoelako"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 "ezin da \"%s\" euskarria aintzat hartu, [%s] zerrenda-fitxategia existitzen "
 "ez delako"
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "ezin da hdlist fitxategi honen [%s] euskarria zehaztu"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "ezin da \"%s\"(r)en hdlist fitxategia atzitu, euskarriari jaramonik ez"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 "ezin da \"%s\"(r)en zerrenda-fitxategia atzitu, euskarriari ez ikusi egingo "
 "zaio"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "lehendik dagoen \"%s\" euskarria saltatzeko ahalegina, ekiditen"
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -248,100 +187,100 @@ msgstr ""
 "\"%s\" euskarri birtualak ez luke hdlist edo fitxategi-zerrenda zehaztuta "
 "eduki beharko, euskarriari ez ikusi egingo zaio"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr ""
 "\"%s\" euskarri birtualak url garbia eduki beharko luke, ez ikusi egingo zaio"
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 "ezin da \"%s\"(r)en hdlist fitxategia aurkitu, euskarriari ez ikusi egin zaio"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 "ezin da \"%s\"(r)en zerrenda-fitxategia aurkitu, euskarriari ez ikusi egin "
 "zaio"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr ""
 "\"%s\" euskarriaren zerrenda-fitxategia inkoherentea da, euskarriari ez "
 "ikusi egin zaio"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
 "ezin da \"%s\"(r)en zerrenda-fitxategia aztertu, euskarriari ez ikusi egin "
 "zaio"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "muntatze-puntu gehiegi \"%s\" euskarri aldagarriarentzat"
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "gailu aldagarria \"%s\" gisa hartzen"
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "\"%s\"(e)rako gailu aldagarriak [%s] erabiltzen"
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "ezin da \"%s\" euskarri aldagarriaren bide-izena berreskuratu"
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "ezin da [%s] konfigurazio-fitxategia idatzi"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "[%s] konfigurazio-fitxategia idatzi"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "Modu paraleloa ezin da use-distrib moduarekin erabili "
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "[%s] fitxategian ezin da \"%s\" analizatu"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "[%s] fitxategiko maneiatzaile paraleloa aztertzen"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "nodoentzako maneiatzaile paraleloa aurkitu da: %s"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "modu paralelorako asoziatutako euskarria erabiltzen: %s"
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "ezin da \"%s\" aukera paraleloa erabili"
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -350,90 +289,90 @@ msgstr ""
 "--laburpena ezin da hauekin erabili: --media, --excludemedia, --sortmedia, --"
 "update edo -parallel"
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "[%s] laburpen-fitxategia aztertzen"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "[%s] hdlist fitxategia aztertzen"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "\"%s\" euskarri birtuala ez da lokala, ez ikusi egingo zaio"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "arazoa \"%s\" euskarriaren hdlist edo laburpen-fitxategia irakurtzean"
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "mendekotasunak kontatzeko bigarren pasada egiten\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "%s paketea saltatzen"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "%s paketea eguneratu beharrean instalatu egingo luke"
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "ezin da rpmdb ireki"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "\"%s\" euskarria lehendik badago"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr "euskarri birtualak lokala izan behar du"
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "%s euskarria gehitu da"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "ezin da lehen instalazio-euskarria atzitu"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "hdlists fitxategia kopiatzen..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "...ezin izan da kopiatu"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "...kopiatzea burutu da"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
@@ -442,43 +381,49 @@ msgstr ""
 "ezin da lehen instalazio-euskarria atzitu (ez da Mandrake/base/hdlists "
 "fitxategia aurkitu)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "hdlist fitxategia berreskuratzen..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "...berreskuratu da"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...berreskuratzeak huts egin du: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "hdlist azalpen baliogabea \"%s\" hdlists fitxategian"
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "existitzen ez den \"%s\" euskarria hautatu nahian zabiltza"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "hainbat euskarri hautatzen: %s"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "\"%s\" euskarria kentzen"
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -488,7 +433,7 @@ msgstr ""
 "ezin da \"%s\" euskarria atzitu,\n"
 "agian euskarria sortzean direktorioa eskuz muntatu zenuelako izan daiteke."
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -497,223 +442,223 @@ msgstr ""
 "\"%s\" euskarri birtualak baliozko hdlist edo fitxategi-zerrenda eduki "
 "beharko luke, ez ikusi egingo zaio"
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "\"%s\"(r)en deskribapen-fitxategia kopiatzen..."
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "iturburuko hdlist-en md5sum kalkulatzen (edo laburpena)"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "MD5SUM fitxategia aztertzen"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "\"%s\"(r)en hdlist iturburua (edo laburpena) kopiatzen..."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "ezin izan da [%s] kopiatu (fitxategia txikiegia da)"
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "kopiatutako iturburuko hdlist-en md5sum kalkulatzen (edo laburpena)"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "ezin izan da [%s] kopiatu (md5sum ez dator bat)"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "arazoa \"%s\" euskarriaren laburpen-fitxategia irakurtzean"
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "[%s](e)ko rpm fitxategiak irakurtzen"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "ezin izan da [%s](e)ko rpm fitxategirik irakurri: %s"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "[%s](e)n ez da rpm fitxategirik aurkitu"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "\"%s\"(r)en iturburuko hdlist (edo laburpena) berreskuratzen..."
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "probatutako hdlist (edo laburpena) aurkitu da %s gisa"
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr ""
 "berreskuratutako iturburuko hdlist-en md5sum kalkulatzen (edo laburpena)"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr "md5sum ez dator bat"
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "ezin izan da hdlist iturburua (edo laburpena) berreskuratu"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "ez da \"%s\" euskarriaren hdlist fitxategirik aurkitu"
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "[%s] fitxategia lehendik erabili da \"%s\" euskarri berean"
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "ezin da \"%s\"(r)en hdlist fitxategia analizatu"
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "ezin da \"%s\"(r)en zerrenda-fitxategia idatzi"
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "\"%s\" euskarriaren zerrenda-fitxategia idazten"
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "ez dago ezer idatzita \"%s\"(r)en zerrenda-fitxategian"
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "\"%s\"(r)en gako publikoen fitxategia aztertzen..."
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...%s gakoa inportatu da \"%s\"(r)en gako publikoen fitxategitik"
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "ezin da \"%s\"(r)en gako publikoen fitxategia inportatu"
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "\"%s\" euskarritik goiburuak irakurtzen"
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "[%s] hdlist eraikitzen"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "\"%s\" euskarrirako hdlist laburpen-fitxategia eraiki da"
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "%d goiburu aurkitu dira cachean"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "%d goiburu zaharkituak cachetik ezabatzen"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "%s muntatzen"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "%s desmuntatzen"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "%s sarrera depslist-en birkokatuta"
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "ez dago birkokatutako sarrerarik depslist-en"
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "rpm fitxategi-izen baliogabea [%s]"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "[%s] rpm fitxategia berreskuratzen..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "ezin izan da rpm fitxategia atzitu [%s]"
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "ezin da rpm fitxategia erregistratu"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "errorea pakete lokalak erregistratzean"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "ez dago %s izeneko paketerik"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Ondoko paketeek %s dute: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "pakete bat baino gehiago dago \"%s\" rpm fitxategi-izen berarekin"
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "ezin da [%s] \"%s\" balioan ondo analizatu"
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -722,63 +667,63 @@ msgstr ""
 "\"%s\" euskarriak zerrenda-fitxategi balio gabea erabiltzen du:\n"
 "  baliteke ispilua eguneratu gabe egotea, ordezko metodoa erabiliko da"
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "\"%s\" euskarriak ez du rpm fitxategientzako kokalekurik definitzen"
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "ez da %s paketea aurkitu."
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi datu-basea blokeatuta"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "\"%s\" euskarria ez dago hautatuta"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "ezin izan dugu [%s] rpm fitxategia \"%s\" euskarrian irakurri"
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 "\"%s\" euskarri inkoherentea aldagarri gisa markatuta dago, baina ez da"
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "ezin izan dugu \"%s\" euskarria atzitu"
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "sarrera gaizki osatuta: [%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "rpm fitxategiak berreskuratzen \"%s\" euskarritik..."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "Prestatzen..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "%d prozesua erabiltzen transakzioa egiteko"
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -786,82 +731,97 @@ msgstr ""
 "transakzioa sortu da %s(e)n instalatzeko (kendu=%d, instalatu=%d,eguneratu=%"
 "d)"
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr "ezin da transakziorik sortu"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "%s paketea kentzen"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "ezin da %s paketea kendu"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "%s paketea gehitzen (id=%d, eid=%d, eguneratzea=%d, fitxategia=%s)"
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "ezin da %s paketea instalatu"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "%s falta delako"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "%s bete gabe dagoelako"
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr "%s jaso nahian"
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr "%s gordetzeko"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "%s instalatzeko"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "%s(r)ekin gatazkak daudelako"
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr "ez da eskatu"
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Sinadura ez da baliozkoa (%s)"
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "ID gakoa ez da baliozkoa (%s)"
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Sinadura falta da (%s)"
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "proxy-adierazpen okerra komando-lerroan\n"
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: ezin da \"%s\" rpm fitxategia irakurri\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Aukera okerra, saiatu berriro\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -878,42 +838,42 @@ msgstr ""
 "\n"
 "erabilera:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - laguntza-mezu hau inprimatzen du.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - automatikoki pakete bat hautatzen du aukeratik.\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 "  --test         - instalazioa behar bezala egin daitekeen egiaztatzen du.\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 "  --force        - deitzea behartzen du, nahiz eta pakete batzuk ez egon.\n"
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - urpmi banatzen du alias-makinen artean.\n"
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - beste root bat erabiltzen du rpm instalatzeko.\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -923,76 +883,66 @@ msgstr ""
 "                   erabilgarria chroot --root aukerarekin (des)"
 "instalatzeko.\n"
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - modu xehatua.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 "  -a             - pakete denak hautatzen ditu bat datozen adierazpenak "
 "kontuan hartuz.\n"
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: \"-%s\" aukera ezezaguna, egiaztatu erabilera --help erabiliz\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr "pakete ezezagunak"
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "pakete ezezaguna"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "%s paketea kentzen baduzu, sistema apurtuko duzu"
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr "Ez dago ezer kentzeko"
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "Ondoko paketeak kentzeko egiaztatzen"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
 "Mendekotasun guztiak behar bezala lagatzeko, ondoko paketeak kendu egingo "
 "dira (%d MB)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (b/E) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "%s kentzen"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr "Kentzean huts egin du"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Aukera okerra, saiatu berriro\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1009,25 +959,25 @@ msgstr ""
 "\n"
 "erabilera:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - eguneratze-euskarria bakarrik erabiltzen du.\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 "  --media        - emandako euskarria bakarrik erabiltzen du, komaz "
 "bereizita.\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 "  --excludemedia - ez erabili adierazitako euskarria, komaz bereizita.\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1035,18 +985,18 @@ msgstr ""
 "  --sortmedia    - euskarriak komaz bereizitako azpikateen arabera "
 "ordenatzen ditu.\n"
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - emandako laburpena erabiltzen du urpmi db-ren ordez.\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - modu xehatua.\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1056,93 +1006,93 @@ msgstr ""
 "--quiet - ez du 'name' etiketa inprimatzen (lehenetsia da komando-lerroan "
 "etiketarik ez badago, modu interaktiboarekin bateraezina).\n"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --uniq         - ez inprimatu lerro berdinak.\n"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all - etiketa guztiak inprimatzen ditu.\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group        - group etiketa inprimatzen du: taldea.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size         - 'size' etiketa inprimatzen du: tamaina.\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --epoch        - epoch etiketa inprimatzen du: aroa.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary      - summary etiketa inprimatzen du: laburpena.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description - description inprimatzen du: azalpena.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr "  --sourcerpm    - sourcerpm etiketa inprimatzen du: iturburuko rpm.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr "  --packager     - packager etiketa inprimatzen du: paketatzailea.\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr ""
 "  --buildhost    - buildhost etiketa inprimatzen du: zein makinatan eraiki "
 "den.\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --url          - url etiketa inprimatzen du: url.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr ""
 "  --provides     - provides etiketa inprimatzen du: eskaintzen duen guztia.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr ""
 "  --requires     - requires etiketa inprimatzen du: eskatzen duen guztia.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files        - files etiketa inprimatzen du: fitxategi guztiak.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr ""
 "  --conflicts    - conflicts etiketa inprimatzen du: gatazka guztiak.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr ""
 "  --obsoletes    - obsoletes etiketa inprimatzen du: zaharkitu guztiak.\n"
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
@@ -1151,54 +1101,54 @@ msgstr ""
 "  --env          - ingurune espezifikoa erabiltzen du (normalean\n"
 "                   errorearen berri ematea).\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr "  -i             - ez bereizi maiuskulak eta minuskulak ereduetan.\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f - bertsioa, argitalpena eta fitxategia ere izenarekin inprimatzen "
 "ditu.\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - perl kodea sartzen du zuzenean perl -e gisa.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 "  -a             - ETA eragile bitarra, egia bi adierazpenak egia badira.\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 "  -o             - EDO eragile bitarra, egia adierazpen bat egia bada.\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - EZ unarioa, egia adierazpena faltsua bada.\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
 "  (              - ezkerreko parentesia taldeko adierazpena irekitzeko.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr "  )              - eskuineko parentesia taldeko adierazpena ixteko.\n"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
@@ -1207,12 +1157,12 @@ msgstr ""
 "atzeradeia hau da :\n"
 "%s\n"
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "%s(e)n ingurune espezifikoa erabiliz\n"
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1229,13 +1179,13 @@ msgstr ""
 "\n"
 "erabilera:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - emandako laburpena erabiltzen du urpmi db-ren ordez.\n"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
@@ -1243,7 +1193,7 @@ msgstr ""
 "  --auto-select - automatikoki sistemaren bertsioa berritzeko paketeak "
 "hautatzen ditu\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
@@ -1252,7 +1202,7 @@ msgstr ""
 "  --no-uninstall - inoiz ez du pakete bat desinstalatu nahi den galdetzen, "
 "instalazioa bertan behera uzten da.\n"
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1261,7 +1211,7 @@ msgstr ""
 "  --keep         - gorde lehendik dauden paketeak ahal bada, ezetsi kentzea\n"
 "                   eragiten duten pakete-eskaerak.\n"
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1273,39 +1223,39 @@ msgstr ""
 "                   baino gehiago instalatu edo bertsio-berrituko badira,\n"
 "                   lehenetsia %d da.\n"
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - transakzio txikiaren luzera, lehenetsia %d da.\n"
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - hurbilketazko bilaketa inposatzen du (-y bezala).\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 "  --src          - hurrengo paketea iturburu-pakete bat da (-s bezala).\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 "  --install-src  - iturburu-paketea bakarrik instalatzen du (binarioak ez).\n"
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - kendu rpm cachetik beste ezer baino lehen.\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - erabili gabeko rpm cachean gordetzen du.\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1314,7 +1264,7 @@ msgstr ""
 "  --allow-nodeps - erabiltzaileari paketeak instalatzeko eskatzeko aukera\n"
 "ematen du, mendekotasunak egiaztatu gabe.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1323,7 +1273,7 @@ msgstr ""
 "  --allow-force  - erabiltzaileari paketeak instalatzeko eskatzeko aukera\n"
 "ematen du, mendekotasunak eta osotasuna egiaztatu gabe.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1332,23 +1282,23 @@ msgstr ""
 "  --use-distrib  - urpmi berehala konfiguratzen du distrib zuhaitzetik, \n"
 "                   erabilgarria chroot --root aukerarekin instalatzeko.\n"
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 "  --wget         - wget erabiltzen du urruneko fitxategiak eskuratzeko.\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl - curl erabiltzen du urruneko fitxategiak eskuratzeko.\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - deskarga-abiadura mugatzen du.\n"
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1358,7 +1308,7 @@ msgstr ""
 "berriro\n"
 "ekiten dio ('--no-resume'-k hori desgaitzen du; lehenetsia desgaituta da).\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1368,7 +1318,7 @@ msgstr ""
 "                   1080 izan behar du lehenespenez (formatua hau da: \n"
 "<proxy-ostalaria[:ataka]>).\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1377,7 +1327,7 @@ msgstr ""
 "  --proxy-user   - zehaztu proxy-aren autentifikazioan erabiltzeko \n"
 "erabiltzailea eta pasahitza (formatua hau da: <erabiltzailea:pasahitza>).\n"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1387,12 +1337,12 @@ msgstr ""
 "argumentuak\n"
 "                   adierazitako direktorioan.\n"
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - X interfazea erabiltzen du.\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1401,7 +1351,7 @@ msgstr ""
 "  --best-output  - aukeratu interfazerik onena ingurunearen arabera:\n"
 "                   X edo testu-modua.\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1411,76 +1361,65 @@ msgstr ""
 "                   (--no-verify-rpm desgaitzen du, lehenetsia gaituta "
 "dago).\n"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - kanpoan uzten du komaz bereizitako bide-izena.\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - docs fitxategiak kanpoan uzten ditu.\n"
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a - komando-lerroko bat-etortze guztiak hautatzen ditu.\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 "  -p     - paketeak aurkitzeko bilaketa 'provides'en egitea baimentzen du.\n"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -p - paketeak aurkitzeko bilaketa ez du 'provides'en egiten.\n"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - inposatu hurbilketazko bilaketa (--fuzzy bezala).\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 "  -s             - hurrengo paketea iturburu-pakete bat da (--src bezala).\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - modu lasaia.\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 "  komando-lerroan idatzitako izenak edo rpm fitxategiak instalatuko dira.\n"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr "Aukeratu fitxategiko gordetzeko kokalekua"
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "proxy-adierazpen okerra komando-lerroan\n"
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: \"-%s\" aukera ezezaguna, egiaztatu erabilera --help erabiliz\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr "Zer egin daiteke rpm fitxategi binarioekin --install-src erabiltzean"
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1501,22 +1440,22 @@ msgstr ""
 "\n"
 "Zer egin nahi duzu?"
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "Ez egin ezer"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr "Bai, instalatu nahi dut"
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr "Gorde fitxategia"
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1531,12 +1470,12 @@ msgstr ""
 "\n"
 "Baliteke gordetzea bakarrik nahi izatea. Zer egin nahi duzu?"
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, c-format
 msgid "Install it"
 msgstr "Instalatu"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1545,42 +1484,42 @@ msgstr ""
 "[%s] direktorioa badago lehendik, erabili beste direktorio bat akatsen berri "
 "emateko edo ezabatu"
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Ezin da erroreen berri emateko [%s] direktorioa sortu"
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Supererabiltzaileak bakarrik du paketeak instalatzeko baimena"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "Ondoko paketeetako bat behar da %s instalatzeko:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Ondoko paketeetako bat behar da:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Zein hautatzen duzu? (1-%d) "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "Paketearen instalazioa..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "Berrabiarazten..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1589,12 +1528,12 @@ msgstr ""
 "Eskatutako pakete bat ezin da instalatu:\n"
 "%s"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr "ados zaude ?"
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1605,7 +1544,7 @@ msgstr ""
 "kendu egin behar direlako, beste batzuen bertsioa berritzeko:\n"
 "%s\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1614,16 +1553,16 @@ msgstr ""
 "Pakete hauek kendu egin behar dira besteak berritzeko:\n"
 "%s"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
 "Mendekotasun guztiak behar bezala lagatzeko, ondoko paketeak instalatuko "
 "dira (%d MB)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1632,37 +1571,47 @@ msgstr ""
 "Root-a izan behar duzu ondoko mendekotasunak instalatzeko:\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "ezin dira iturburuko paketeak lortu, abortatzen"
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Sartu \"%s\" izena duen euskarria [%s] gailuan"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Prest zaudenean sakatu Sartu..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "`%s' paketea deskargatzen..."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% / %s eginda, ETA = %s, abiadura = %s"
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% eginda, abiadura = %s"
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Ondoko pakete hauek sinadura okerra dute"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Instalatzen jarraitu nahi duzu?"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1673,58 +1622,58 @@ msgstr ""
 "%s\n"
 "Zure urpmi datu-basea eguneratzea komeni da"
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "Instalazioak huts egin du"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr "%s banatzen"
 
 # zy, c-format
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr "%s instalatzen"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "`%s' paketea instalatzen (%s/%s)..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Mendekotasunak egiaztatu gabe saiatu nahi duzu instalatzen? (b/E) "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Areago instalatzen saiatu (--force)? (b/E) "
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d instalazio-transakzioek huts egin dute"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "Instalazioa posible da"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "Dena dago instalatuta"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr "urpmi berrabiarazten"
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1752,25 +1701,25 @@ msgstr ""
 "\n"
 "eta [aukerak] hemengoak dira\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - eguneratze-euskarria sortzen du.\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
 "  --probe-synthesis - laburpen-fitxategia bilatzen eta erabiltzen saiatzen "
 "da.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr ""
 "  --probe-hdlist - hdlist fitxategia bilatzen eta erabiltzen saiatzen da.\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
@@ -1779,7 +1728,7 @@ msgstr ""
 "  --no-probe     - ez saiatu laburpenik edo hdlist "
 "fitxategirik                   bilatzen\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -1788,7 +1737,7 @@ msgstr ""
 "  --distrib      - instalazio-euskarri batetik euskarri guztiak sortzen \n"
 "                   ditu automatikoki.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1799,7 +1748,7 @@ msgstr ""
 "                   automatikoki. XXX main, contrib, updates edo\n"
 "                   konfiguratu den beste edozer izan daiteke ;-)\n"
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1808,7 +1757,7 @@ msgstr ""
 "  --from         - ispiluen zerrendaren url espezifikoa erabiltzen du,\n"
 "                   lehenetsia %s da\n"
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1819,7 +1768,7 @@ msgstr ""
 "                   instalatutako mandrake-release paketean jartzen "
 "duen                   bertsiotik hartutakoa da.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
@@ -1829,7 +1778,7 @@ msgstr ""
 "                   instalatutako mandrake-release paketearen arkitektura "
 "da.\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
@@ -1838,73 +1787,53 @@ msgstr ""
 "  --virtual      - beti eguneratuta dauden euskarri birtualak sortzen ditu,\n"
 "                   file:// protokoloa bakarrik onartzen da.\n"
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - MD5SUM fitxategiaren egiaztapena desgaitzen du.\n"
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - garbitu goiburuen cache direktorioa.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - hdlist fitxategiak sortzera behartzen du.\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"aukera ezezagunak '%s'\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "ezin dira cooker banaketa baten eguneratzeak gehitu\n"
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "%s(e)ko ispiluak berreskuratzen..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr ""
-"%s\n"
 "ez dago <hdlist-en bide-izen erlatiboa> --distrib erabiliz eman beharrik"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "ezin da \"%s\" euskarria eguneratu\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"<hdlist bide-izen erlatiboa> falta da\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<hdlist bide-izen erlatiboa> falta da\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"sareko euskarriaren `with' falta da\n"
+msgid "`with' missing for network media\n"
+msgstr "sareko euskarriaren `with' falta da\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "ezin da \"%s\" euskarria sortu\n"
@@ -1923,6 +1852,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - euskarri guztiak hautatzen ditu.\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"aukera ezezagunak '%s'\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1937,7 +1875,7 @@ msgstr ""
 "kendu beharreko sarrera falta da\n"
 "(%s(e)tako bat\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1946,28 +1884,28 @@ msgstr ""
 "Erabilera: urpmi.update [aukerak] <izena> ...\n"
 "non <izena> eguneratu beharreko euskarri-izena den.\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - eguneratze-euskarria bakarrik eguneratzen du.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr "  --force-key    - gpg gakoa eguneratzera behartzen du.\n"
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - euskarri ez-aldagarri guztiak hautatzen ditu.\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "ez dago eguneratzeko ezer (erabili urpmi.addmedia euskarria gehitzeko)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1976,7 +1914,7 @@ msgstr ""
 "eguneratu beharreko sarrera falta da\n"
 "(%s(e)tako bat\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1993,43 +1931,43 @@ msgstr ""
 "\n"
 "erabilera:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - pakete erabilgarrien zerrenda.\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - euskarri erabilgarrien zerrenda.\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr ""
 "  --list-url  - erabilgarri dauden euskarriak eta haien url-a zerrendatzen "
 "ditu.\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 "  --dump-config  - config urpmi.addmedia argumentu gisa iraultzen du.\n"
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 "  --list-nodes   - --parallel erabiltzean erabilgarri dauden nodoen "
 "zerrenda .\n"
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - alias paralelo erabilgarrien zerrenda.\n"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
@@ -2038,7 +1976,7 @@ msgstr ""
 "  --headers      - zerrendatutako paketeen goiburuak urpmi db-tik atera\n"
 "                   eta stdout-era eramaten ditu (root-ek bakarrik).\n"
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
@@ -2046,7 +1984,7 @@ msgstr ""
 "--sources - iturburu-pakete guztiak deskargatu aurretik ematen ditu \n"
 " (root-ek bakarrik).\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
@@ -2055,17 +1993,17 @@ msgstr ""
 "  --use-distrib  - urpmi berehala konfiguratzen du distrib zuhaitzetik.\n"
 "                   Horren bidez distro bati kontsulta egin diezaiokezu.\n"
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - changelog inprimatzen du.\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - kontsulta paketeen mendekoetara zabaltzen du.\n"
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -2073,57 +2011,114 @@ msgid ""
 msgstr ""
 "-u               - paketea kentzen du bertsio berriagoa instalatuta badago.\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - osatu irteera kendu behar den paketearekin.\n"
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - paketeak behar duenaren alderantzizko bilaketa.\n"
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 "  -i     - informazio erabilgarria pertsonek irakurtzeko moduan inprimatzen "
 "du.\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - taldeak ere izenarekin inprimatzen ditu.\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr ""
 "  -r             - bertsioa eta argitalpena ere izenarekin inprimatzen "
 "ditu.\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - paketeko fitxategiak zerrendatzen ditu.\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 "  komando-lerroan idatzitako izenak edo rpm fitxategiak kontsultatu dira.\n"
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: \"-%s\" aukera ezezaguna, egiaztatu erabilera --help erabiliz\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: ezin da \"%s\" rpm fitxategia irakurri\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--nodo-zerrendak honekin bakarrik erabil daitezke: --parallel"
+
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "webfetch ezezaguna `%s' !!!\n"
+
+#~ msgid "copy failed: %s"
+#~ msgstr "kopia honek huts egin du: %s"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "wget ez dago\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "wget-ek huts egin du: %d(r)ekin edo %d seinalearekin irten da\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "curl ez dago\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "curl-ek huts egin du: %d(r)ekin edo %d seinalearekin irten da\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "rsync ez dago\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "rsync-ek huts egin du: %d(r)ekin edo %d seinalearekin irten da\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "ssh ez dago\n"
+
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpme: \"-%s\" aukera ezezaguna, egiaztatu erabilera --help erabiliz\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpmi: \"-%s\" aukera ezezaguna, egiaztatu erabilera --help erabiliz\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr ""
+#~ "Mendekotasun guztiak behar bezala lagatzeko, ondoko paketeak instalatuko "
+#~ "dira (%d MB)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "ez dago <hdlist-en bide-izen erlatiboa> --distrib erabiliz eman beharrik"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "<hdlist bide-izen erlatiboa> falta da\n"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "sareko euskarriaren `with' falta da\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpmq: \"-%s\" aukera ezezaguna, egiaztatu erabilera --help erabiliz\n"
diff --git a/po/fa.po b/po/fa.po
index 48b257d8..50b42f8d 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-fa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2004-03-13 20:16+0330\n"
 "Last-Translator: Abbas Izad <abbasizad@hotmail.com>\n"
 "Language-Team: Persian\n"
@@ -49,22 +49,22 @@ msgstr ""
 "نصب خودکار بسته‌ها...\n"
 "شما تقاضای نصب بسته %s را نمودید\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "تایید می‌کنید؟"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "تایید"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "لغو"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) "
@@ -74,7 +74,7 @@ msgstr " (Y/n) "
 msgid "%s: command not found\n"
 msgstr "%s: فرمان یافت نشد\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
@@ -83,117 +83,56 @@ msgstr ""
 "طرز استفاده: %s [گزینه‌ها]\n"
 "[گزینه‌ها] از\n"
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - چاپ این پیغام راهنما.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "   -g [group]     - محدودیت نتایج به گروه داده شده.\n"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, c-format
 msgid "                    defaults is %s.\n"
 msgstr "                    %s پیش‌فرض است.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "webfetch ناشناس `%s' !!!\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "پایان‌نامه‌ی ناشناس برای %s تعیین شده است"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "هیچ webfetch یافت نشد، webfetch دارای پشتیبانی: %s\n"
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "نمی‌توان پایان‌نامه را اداره کرد: %s"
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "کپی کردن شکست خورد: %s"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "wget وجود ندارد\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget شکست خورد: خروج %d یا علامت %d\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "curl وجود ندارد\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl شکست خورد: خروج با %d یا سیگنال %d\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "rsync وجود ندارد\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "rsync شکست خورد: خروج با %d یا علامت %d\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "ssh وجود ندارد\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% of %s تکمیل شد, ETA = %s, سرعت = %s"
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% تکمیل شد, سرعت = %s"
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...دریافت شکست خورد: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "خطای املایی در پرونده تنظیم در خط %s"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 "رسانه‌ی \"%s\" سعی می‌کند تا از لیست قبلاً استفاده شده hdlist استفاده کند، "
 "نادیده‌گیری رسانه"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 "رسانه \"%s\" تلاش می‌کند تا از یک لیست استفاده شده استفاده کند، رسانه نادیده "
 "گرفته می‌شود"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -202,39 +141,39 @@ msgstr ""
 "نمی‌توان رسانه‌ی \"%s\" را بخاطر اینکه پرونده لیست بوسیله رسانه دیگری استفاده "
 "شده اداره کرد"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 "نمی‌توان از نام \"%s\" برای رسانه‌ی بی‌نام که قبلاً مورد استفاده است استفاده کرد"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr "نمی‌توان رسانه‌ی \"%s\" را در نظر گرفت چرا که پرونده [%s] وجود ندارد"
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "نمی‌توان رسانه‌ی این پرونده hdlist را تعیین کرد [%s]"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "نمی‌توان به پرونده hdlist \"%s\" دسترسی یافت، رسانه نادیده گرفته می‌شود "
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 "نمی‌توان به پرونده لیست \"%s\" دسترسی پیدا کرد، رسانه نادیده گرفته می‌شود"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "تلاش برای گذشتن از کنار رسانه‌ی موجود \"%s\", پرهیز"
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -243,94 +182,94 @@ msgstr ""
 "رسانه‌ی مجازی \"%s\" نباید سرلیست یا پرونده‌ی لیست را تعریف می‌کرد، رسانه "
 "نادیده گرفته می‌شود"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr ""
 "رسانه مجازی \"%s\" باید یک نشانی درست داشته باشد، رسانه نادیده گرفته می‌شود"
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 "نمی‌توان پرونده hdlist را برای \"%s\" پیدا کرد، رسانه نادیده گرفته می‌شود"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "نمی‌توان پرونده لیست را برای \"%s\" پیدا کرد، رسانه نادیده گرفته می‌شود"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "پرونده‌ی لیست بی‌ارتباط برای \"%s\"، رسانه نادیده گرفته شد"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "ناتوان در بررسی پرونده‌ی لیست \"%s\", رسانه نادیده گرفته شد"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "نقاط سوارسازی بیش از اندازه برای رسانه قابل انتقال \"%s\""
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "پذیرش دستگاه‌های قابل انتقال مانند \"%s\""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "استفاده از دستگاه قابل انتقال متفاوت [%s] برای \"%s\""
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "نمی‌توان نام مسیر را برای رسانه قابل انتقال \"%s\" دریافت کرد"
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "نمی‌توان پرونده‌ی تنظیم [%s] را نوشت"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "نگارش پرونده تنظیم [%s]"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "نمی‌توان از حالت موازی با حالت use-distrib استفاده کرد"
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "نمی‌توان  \"%s\" را در پرونده [%s] تجزیه کرد"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "آزمایش دستگیره مواری در پرونده‌ی [%s]"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "یافت دستگیره موازی برای گره‌ها: %s"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "استفاده از رسانه‌های مربوطه برای حالت موازی: %s"
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "نمی‌توان از گزینه موازی \"%s\" استفاده کرد"
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -339,90 +278,90 @@ msgstr ""
 "--synthesis نمی‌تواند با --media, --excludemedia, --sortmedia, --update یا --"
 "parallel استفاده شود"
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "آزمایش پرونده ترکیب [%s]"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "آزمایش پرونده hdlist [%s]"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "رسانه مجازی \"%s\" محلی نیست، رسانه نادیده‌ گرفته شد"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "مشکل در خواندن سرلیست یا پرونده‌ی ترکیب رسانه‌ی \"%s\""
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "در حال اجرای دومین نوبت حساب کردن وابستگی‌ها\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "نادیده‌گیری بسته‌ی %s"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "بجای ارتقای بسته %s نصب خواهد شد"
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "نمی‌توان rpmdb را باز کرد"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "رسانه \"%s\" قبلاً وجود دارد"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr "رسانه‌ی مجازی  لازم است محلی باشد"
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "رسانه اضافه شده %s"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "نمی‌توان به اولین رسانه‌ی نصب دسترسی پیدا کرد"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "در حال کپی کردن پرونده hdlists..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "...کپی کردن شکست خورد"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "...کپی شد"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
@@ -431,43 +370,49 @@ msgstr ""
 "ناتوان به دسترسی اولین رسانه‌ی نصب (هیچ پرونده‌ی ماندرایک/پایه/لیست دیسک پیدا "
 "شد)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "دریافت پرونده‌ی hdlists..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "...دریافت انجام گرفت"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...دریافت شکست خورد: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "توضیحات نامعتبر hdlist \"%s\" در پرونده hdlists"
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "تلاش برای انتخاب رسانه‌ \"%s\" که وجود ندارد"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "انتخاب چندین رسانه ها: %s"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "برداشتن رسانه‌ی \"%s\""
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -478,7 +423,7 @@ msgstr ""
 "این می‌تواند در صورتی که شما شاخه را هنگام ایجاد رسانه دستی سوار کرده باشید "
 "اتفاق بیافتد."
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -487,222 +432,222 @@ msgstr ""
 "رسانه‌ی مجازی \"%s\" باید منبع معتبر hdlist یا ترکیب داشته باشد، رسانه نادیده "
 "گرفته شد"
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "کپی کردن پرونده‌ی توضیحات \"%s\"..."
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "حساب کردن md5sum برای hdlist منبع موجود (یا ترکیب)"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "آزمایش پرونده‌ی MD5SUM "
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "کپی hdlist منبع (یا ترکیب) \"%s\"..."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "کپی از [%s] شکست خورد (پرونده بطرز مشکوکی کوچک است)"
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "حساب کردن md5sum سرلیست منبع کپی شده (یا ترکیب)"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "کپی کردن [%s] شکست خورد (عدم تطابق md5sum)"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "مشکل در خواندن پرونده‌ی ترکیب رسانه‌ی \"%s\""
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "خواندن پرونده‌های rpm از [%s]"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "نمی‌توان پرونده‌های rpm را از [%s] خواند: %s"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "هیچ پرونده‌های rpm از [%s] پیدا نشد"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "دریافت hdlist منبع (یا ترکیب) \"%s\"..."
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "hdlist (یا ترکیب) شناسایی شده مانند %s یافت شد"
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "حساب کردن md5sum از hdlist منبع دریافت شده (یا ترکیب)"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr "عدم تطابق md5sum "
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "دریافت لیست منبع (یا ترکیب) شکست خورد"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "هیچ پرونده‌ی hdlist برای رسانه \"%s\" یافت شد"
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "پرونده [%s] قبلاً در همان رسانه \"%s\" استفاده شده است"
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "نمی‌توان پرونده hdlist \"%s\" را تجزیه کرد"
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "نمی توان پرونده لیست \"%s\" را نوشت"
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "نگارش پرونده لیست برای رسانه \"%s\""
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "هیچ چیزی در پرونده‌ی لیست برای \"%s\" نوشته نشده است"
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "در حال آزمایش پرونده کلید عمومی \"%s\"..."
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...در حال وارد کردن کلید %s از پرونده کلیدعمومی \"%s\""
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "نمی‌توان پرونده کلید عمومی \"%s\" را وارد کرد"
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "خواندن سرآیندها از رسانه \"%s\""
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "ساختن hdlist [%s]"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "ساختن پرونده ترکیب hdlist برای رسانه \"%s\""
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "%d سرآیند در حافظه پنهان یافت شد"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "برداشتن سرآیند‌های کهنه %d در حافظه‌ی پنهان"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "سوار کردن %s"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "پیاده کردن %s"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "جابجایی ورودی‌های %s در depslist"
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "هیچ ورودی‌هایی در depslist جابجا شده است"
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "نام پرونده rpm نامعتبر [%s]"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "در حال دریافت پرونده‌ی rpm [%s] ..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "نمی‌توان به پرونده rpm [%s] دسترسی یافت"
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "نمی‌توان پرونده rpm را بایگانی کرد"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "خطا در بایگانی کردن بسته‌های محلی"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "هیچ بسته‌ای با نام %s"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "بسته‌های بدنبال آمده حاوی %s: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "چندین بسته با نام پرونده rpm یکسان \"%s\" وجود دارد"
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "نمی توان بدرستی [%s] را بر ارزش \"%s\" تجزیه کرد"
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -711,143 +656,158 @@ msgstr ""
 "رسانه \"%s\" از یک پرونده لیست نامعتبر استفاده می‌کند:\n"
 "  آینه احتمالاً بروز نمی‌باشد، در حال تلاش برای استفاده از روش جایگزین"
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "رسانه \"%s\" هیچ مکانی را برای پرونده‌های rpm مشخص نمی‌کند"
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "بسته‌ی %s پیدا نشد."
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "بانک اطلاعات urpmi قفل شده است"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "رسانه \"%s\" انتخاب نشده است"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "نمی‌توان پرونده rpm [%s] را از رسانه \"%s\" خواند"
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "رسانه بی‌ارتباط \"%s\" قابل انتقال نشان داده شده ولی نه واقعاً"
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "نمی‌توان به رسانه \"%s\" دسترسی پیدا کرد"
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "درون‌ریز درهمریخته: [%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "دریافت پرونده‌های rpm از رسانه \"%s\"..."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "در حال آماده کردن..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "استفاده از پروسه‌ی %d برای اجرای مبادله"
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr "قطعات ایجاد شده برای نصب بر %s (remove=%d, install=%d, upgrade=%d)"
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr "نمی‌توان تکه‌های انتقالی را ایجاد کرد"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "برداشتن بسته %s"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "نمی‌توان بسته‌ی %s را برداشت"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "افرودن بسته %s (id=%d, eid=%d, update=%d, file=%s)"
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "نمی‌توان بسته %s را نصب کرد"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "بدلیل عدم وجود %s"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "بدلیل عدم رضایت %s"
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr "تلاش برای ترفیع %s"
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr "برای نگهداشتن %s"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "برای نصب %s"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "بدلیل اختلاف با %s"
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr "خواسته نشده"
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "امضای نامعتبر (%s)"
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "شناسه کلید نامعتبر (%s)"
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "عدم وجود امضا (%s)"
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "تعریف بد پراکسی بر خط فرمان\n"
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: نمی‌توان پرونده rpm \"%s\" را خواند\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "متأسفم، انتخاب بد، دوباره امتحان کنید\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -863,42 +823,42 @@ msgstr ""
 "\n"
 "طرز استفاده:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - چاپ این پیغام راهنما.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - انتخاب یک بسته بطور خودکار در انتخاب‌ها.\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 "  --test         - تصدیق کردن اینکه آیا نصب می‌تواند بدرستی انجام پذیرد.\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 "  --force        - اجبار درخواست حتی اگر بعضی از بسته ها وجود ندارند.\n"
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - urpmi منتشر شده در بین ماشین‌های مستعار.\n"
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - استفاده از ریشه‌ی دیگری برای نصب rpm.\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -907,73 +867,63 @@ msgstr ""
 "  --use-distrib  - urpmi را در هوا از درخت distrib پیکربندی می‌کند، برای\n"
 "                   نصب(برداری) یک chroot با گزینه‌ی --root مفید است.\n"
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - حالت لغتی.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - انتخاب تمام بسته‌های مطابق با عبارت.\n"
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: گزینه‌ی ناشناس \"-%s\", طرز استفاده را با --help بررسی نمایید\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr "بسته‌های ناشناس"
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "بسته‌ی ناشناس"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "برداشتن بسته‌ی %s سیستم شما را خواهد شکست"
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr "هیچ چیزی برای برداشتن"
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "در حال بررسی برای برداشتن بسته‌های بدنبال آمده"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
 "برای ارضای وابستگی‌ها، بسته‌های بدنبال آمده برداشته خواهند شد (%d مگابایت)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (y/N) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "برداشتن %s"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr "برداشتن شکست خورد"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "متأسفم، انتخاب بد، دوباره امتحان کنید\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -989,41 +939,41 @@ msgstr ""
 "\n"
 "طرز استفاده:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - فقط استفاده از رسانه‌های بروزسازی.\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 "  --media        - فقط از رسانه‌های داده شده، جدا شده با ویرگول استفاده شود.\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 "  --excludemedia - از رسانه‌ی داده نشده استفاده نشود، جدا شده توسط ویرگول.\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 "  --sortmedia    - ترتیب دادن رسانه‌ها بر اساس زیررشته‌ها جدا شده با ویرگول.\n"
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr "  --synthesis    - استفاده از ترکیب داده شده بجای urpmi db.\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - حالت لغتی.\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1034,87 +984,87 @@ msgstr ""
 "نشود\n"
 "                   خط, غیرهمخوان با حالت تأثیری).\n"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --uniq         - خطهای یکسان چاپ نشوند.\n"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all          - چاپ همه برچسب‌ها.\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group        - چاپ برچسب گروه: گروه.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size         - چاپ برچسب اندازه: اندازه.\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --epoch        - چاپ برچسب epoch: epoch.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary      - برچسب خلاصه‌ی چاپ: خلاصه.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description  - چاپ برچسب توضیحات: توضیحات.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr "  --sourcerpm    - چاپ برچسب sourcerpm: منبع rpm.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr "  --packager     - چاپ برچسب بسته‌گر: packager.\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr "  --buildhost    - چاپ برچسب ساخت‌میزبان: ساختن میزبان.\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --url          - چاپ برچسب url: url.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr "  --provides     - برچسب چاپ عرضه می‌دارد: عرضه‌ی همه.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr "  --requires     - چاپ برچسب لازمه: همه لازم.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files        - چاپ برچسب پرونده ها: همه پرونده‌ها.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr "  --conflicts    - چاپ برچسب اختلاف‌ها: همه اختلاف‌ها.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr "  --obsoletes    - چاپ برچسب کهنه‌ها: همه کهنه‌ها.\n"
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
@@ -1123,51 +1073,51 @@ msgstr ""
 "  --env          - استفاده از محیط مشخص (معمولاً یک گزارش\n"
 "                   اشکال).\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr "  -i             - نادیده‌گیری موارد تفاوتی در هر الگو.\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - چاپ نسخه، انتشار و ساختار با نام.\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - ضمیمه مستقیم رمز پرل مانند perl -e.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 "  -a             - binary AND operator, true اگر هر دو عبارت درست باشند.\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 "  -o             - binary OR operator, درست است اگر یک تعریف درست باشد.\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - unary NOT, true اگر عبارت false باشد.\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr "  (              - پرانطز چپ برای باز کردن عبارت گروه.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr "  )              - پرانطز راست برای بستن عبارت گروه.\n"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
@@ -1176,12 +1126,12 @@ msgstr ""
 "callback is :\n"
 "%s\n"
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "استفاده از محیط مشخص بر %s\n"
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1197,25 +1147,25 @@ msgstr ""
 "\n"
 "طرز استفاده:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - استفاده از ترکیب داده شده بجای urpmi db.\n"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - انتخاب بطور خودکار بسته‌ها برای ارتقای سیستم.\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr "  --no-uninstall - هرگز برای عزل یک بسته پرسش نشود، پایان نصب.\n"
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1224,7 +1174,7 @@ msgstr ""
 "  --keep         - نگهداشتن بسته‌های موجود در صورت ممکن، عدم پذیرش بسته‌هایی\n"
 "                   که به برداشتن ختم می‌شود.\n"
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1235,37 +1185,37 @@ msgstr ""
 "                   قرار است نصب یا ارتقا داده شوند،\n"
 "                   پیش‌فرض %d می‌باشد.\n"
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - اندازه‌های کوچک انتقال, پیش‌فرض %d می‌باشد.\n"
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - تحمیل جستجوی فازی (همانند -y).\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - بسته‌ی بعدی یک بسته‌ی منبع (مانند -s) می‌باشد.\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - فقط بسته‌ی منبع نصب می‌شود (نه باینری).\n"
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - برداشتن rpm از حافظه پنهان قبل از هر چیز دیگر.\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - نگهداری rpm استفاده نشده در حافظه‌ی پنهان.\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1274,7 +1224,7 @@ msgstr ""
 "  --allow-nodeps - اجازه‌ی پرسش از کاربر برای نصب بسته‌ها بدون بررسی\n"
 "                   وابستگی‌ها را می‌دهد.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1283,7 +1233,7 @@ msgstr ""
 "  --allow-force  - اجازه‌ی پرسش از کاربر برای نصب بسته‌ها بدون\n"
 "                   بررسی وابستگی و درستی آنها.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1292,24 +1242,24 @@ msgstr ""
 "··--use-distrib··-·urpmi·را·در·هوا·از·درخت·distrib·پیکربندی·می‌کند،·برای\n"
 "···················نصب(برداری)·یک·chroot·با·گزینه‌ی·--root·مفید·است.\n"
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 "  --wget         - از wget برای دریافت پرونده‌های دوردست استفاده نمایید.\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 "  --curl         - از curl برای دریافت پرونده‌های دور دست استفاده شود.\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - محدود کردن سرعت بارگیری.\n"
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1319,7 +1269,7 @@ msgstr ""
 "                   (--no-resume آن را از کار می‌اندازد, ازکارافتاده پیش‌فرض "
 "است).\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1328,7 +1278,7 @@ msgstr ""
 "  --proxy        - استفاده از پراکسی HTTP، شماره درگاه بوسیله‌ی پیش فرض\n"
 "                   ۱۰۸۰ فرض شده است (قالب آن <proxyhost[:port]> می‌باشد).\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1337,7 +1287,7 @@ msgstr ""
 "  --proxy-user   - کاربر و گذرواژه را برای اعتبارسنجی پراکسی مشخص\n"
 "                   می‌کند (قالب آن <user:password>است).\n"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1346,12 +1296,12 @@ msgstr ""
 "  --bug          - بیرون‌ریزی یک گزارش اشکال در شاخه‌ی مشخص شده بوسیله\n"
 "                   مبحث بعدی.\n"
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - استفاده از واسط X.\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1360,7 +1310,7 @@ msgstr ""
 "  --best-output  - انتخاب بهترین واسط براساس محیط:\n"
 "                   X یا حالت متن .\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1369,74 +1319,63 @@ msgstr ""
 "  --verify-rpm   - تصدیق امضاهای rpm قبل از نصب\n"
 "                   (--no-verify-rpm غیر فعال شود، پیش‌فرض فعال شده است).\n"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - مسیر بوسیله‌ی ویرگول جدا کننده خارج شود .\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - پرونده‌های نوشتاری محسوب نشوند.\n"
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - انتخاب همه مطابقت‌ها بر خط فرمان.\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - جستجو در عرضه‌ها برای یافتن بسته را اجازه می‌دهد.\n"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - جستجو در عرضه‌ها برای یافتن بسته نشود.\n"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - تحمیل جستجوی فازی (همانند --fuzzy).\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s             - بسته‌ی بعدی یک بسته‌ی منبع (مانند --src) می‌باشد.\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - حالت ساکت.\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  نام‌ها یا پرونده‌های rpm داده شده بر خط فرمان نصب خواهند شد.\n"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr "مکان ذخیره‌ی پرونده را انتخاب کنید"
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "تعریف بد پراکسی بر خط فرمان\n"
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: گزینه‌ی ناشناس \"-%s\", طرز استفاده را با --help بررسی نمایید\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 "آنچه می‌توان با پرونده‌های باینری rpm انجام داد هنگام استفاده --install-src"
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1457,22 +1396,22 @@ msgstr ""
 "\n"
 "چکار می‌خواهید انجام دهید؟"
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "هیچکاری "
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr "بله، واقعا آن نصب شود"
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr "ذخیره‌ی پرونده"
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1487,12 +1426,12 @@ msgstr ""
 "\n"
 "ممکن ایت ترجیح دهید فقط آن را ذخیره کنید. امنخاب شما کدام است؟"
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, c-format
 msgid "Install it"
 msgstr "نصب گردد"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1501,42 +1440,42 @@ msgstr ""
 "شاخه‌ی [%s] از قبل وجود دارد، لطفا از شاخه‌ی دیگری برای گزارش اشکال استفاده "
 "کنید یاآن را حذف کنید"
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "نمی‌توان شاخه‌ی [%s] را برای گزارش اشکال ایجاد کرد"
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "فقط کاربر برتر برای نصب بسته‌ها مجاز می‌باشد"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "یکی از بسته‌های بدنبال آمده برای نصب %s مورد نیاز است:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "یکی از بسته‌های بدنبال آمده لازم است:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "انتخاب شما چه است؟ (1-%d) "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "نصب بسته..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "آشناسازی..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1545,12 +1484,12 @@ msgstr ""
 "بعضی از بسته‌های خواسته شده نمی‌توانند نصب شوند:\n"
 "%s"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr "آیا موافقید؟"
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1561,7 +1500,7 @@ msgstr ""
 "باید برداشته شوند تا بسته‌های دیگر بتوانند ارتقا یابند: \n"
 "%s\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1570,14 +1509,14 @@ msgstr ""
 "بسته‌های بدنبال آمده باید برداشته شوند تا بسته‌های دیگر بتوانند ارتقا یابند:\n"
 "%s"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr "برای ارضای وابستگی‌ها، بسته‌های بدنبال آمده نصب خواهند شد (%d مگابایت)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1586,37 +1525,47 @@ msgstr ""
 "برای نصب وابستگی‌های بدنبال آمده شما باید مدیر سیستم باشید:\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "نمب‌توان بسته های منبع را دریافت کرد، پایان داده می‌شود"
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "لطفاً رسانه‌ی بنام \"%s\" بر دستگاه [%s] را داخل نمایید"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "وقتی آماده‌اید ورود را فشار دهید..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "بارگیری بسته `%s'..."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% of %s تکمیل شد, ETA = %s, سرعت = %s"
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% تکمیل شد, سرعت = %s"
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "بسته‌های بدنبال آمده امضاهای بد دارند"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "آیا می‌خواهید نصب را ادامه دهید؟"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1627,57 +1576,57 @@ msgstr ""
 "%s\n"
 "بهتر است بانک اطلاعات urpmi را بروزسازی نمایید"
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "نصب شکست خورد"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr "انتشار دادن %s"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr "نصب %s"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "نصب بسته `%s' (%s/%s)..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "تلاش برای نصب بدون بررسی وابستگی‌ها؟ (y/N) "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "تلاش برای نصب حتی قویتر (--force)؟ (y/N) "
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d معامله‌های نصب شکست خورد"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "نصب ممکن می‌باشد"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "همه چیز قبلاً نصب شده است"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr "راه‌اندازی دوباره‌ی urpmi"
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1702,22 +1651,22 @@ msgstr ""
 "\n"
 "و [گزینه‌ها] هستند از\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - ایجاد یک رسانه بروزسازی.\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr "  --probe-synthesis - تلاش برای یافتن و استفاده از پرونده ترکیب.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr "  --probe-hdlist - تلاش برای پیدا کردن و استفاده از پرونده‌ی hdlist.\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
@@ -1726,7 +1675,7 @@ msgstr ""
 "  --no-probe     - تلاش برای یافتن هیچ پرونده‌ی ترکیب یا\n"
 "                   hdlist نشود.\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -1735,7 +1684,7 @@ msgstr ""
 "  --distrib      - بطور خودکار همه‌ی رسانه‌ها را از یک رسانه‌ی نصب ایجاد\n"
 "                   می‌کند.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1746,7 +1695,7 @@ msgstr ""
 "                   انتشار، XXX می‌تواند یک اصل، کمک، بروزسازی‌ها یا \n"
 "                   هرچیز دیگر تنظیم شده باشد ;-)\n"
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1755,7 +1704,7 @@ msgstr ""
 "  --from         - استفاده از url مشخص شده برای لیست آینه‌ها،پیش‌فرض\n"
 "                   %s می‌باشد\n"
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1766,7 +1715,7 @@ msgstr ""
 "                   گفته شده توسط بسته نصب شده انتشار-ماندرایک \n"
 "                   گرفته شده است.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
@@ -1775,7 +1724,7 @@ msgstr ""
 "  --arch         - استفاده از ساختار مشخص شده، پیش‌فرض ساختار \n"
 "                   بسته نصب شده انتشار ماندرایک است.\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
@@ -1784,73 +1733,52 @@ msgstr ""
 "  --virtual      - ایجاد رسانه مجازی که همیشه بروز شده هستند،\n"
 "                   فقط پایان‌نامه file:// مجاز می‌باشد.\n"
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - بررسی MD5SUM پرونده را از کار می‌اندازد.\n"
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - سرآیندهای شاخه حافظه پنهان را پاک می‌کند.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - اجبار تولید پرونده‌های hdlist.\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"گزینه‌های ناشناس '%s'\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "نمی‌توان بروزسازی‌ها را به یک انتشار آزمایشی اضافه نمود\n"
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "دریافت آینه‌ها در %s ..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"احتیاجی به دادن <relative path of hdlist> با --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "احتیاجی به دادن <relative path of hdlist> با --distrib"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "نمی‌توان رسانه \"%s\" را بروزسازی کرد\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"<relative path of hdlist> وجود ندارد\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<relative path of hdlist> وجود ندارد\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"`با' رسانه‌های شبکه که وجود ندارند\n"
+msgid "`with' missing for network media\n"
+msgstr "`با' رسانه‌های شبکه که وجود ندارند\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "نمی‌توان رسانه \"%s\" را ایجاد کرد\n"
@@ -1869,6 +1797,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - انتخاب تمام رسانه‌ها.\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"گزینه‌های ناشناس '%s'\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1884,7 +1821,7 @@ msgstr ""
 "ورودی برای برداشتن وجود ندارد\n"
 "(یکی از %s)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1893,28 +1830,28 @@ msgstr ""
 "طرز استفاده: urpmi.update [گزینه‌ها] <name> ...\n"
 "که <name> یک نام رسانه برای بروزسازی می‌باشد.\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       -  فقط بروزسازی رسانه‌های بروزسازی.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr "  --force-key    - اجبار بروزسازی کلید gpg.\n"
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - انتخاب همه رسانه‌های غیر قابل انتقال.\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "هیچ چیز برای بروزسازی (استفاده از urpmi.addmedia برای اضافه کردن یک رسانه)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1923,7 +1860,7 @@ msgstr ""
 "ورودی برای بروزسازی وجود ندارد\n"
 "(یکی از %s)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1939,38 +1876,38 @@ msgstr ""
 "\n"
 "طرز استفاده:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - لیست کردن بسته‌های موجود.\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - لیست رسانه‌های موجود.\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - رسانه‌ی در دسترس و url آنها را فهرست می‌کند.\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr "  --dump-config  - تخلیه‌ی پیکربندی به شکل آرگومان urpmi.addmedia.\n"
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr "  --list-nodes   - list available nodes when using --parallel.\n"
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - نام های مستعار موازی موجود را فهرست می‌کند.\n"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
@@ -1979,14 +1916,14 @@ msgstr ""
 "  --headers      - بازیابی سرآیندها برای بسته فهرست شده از  urpmi db به\n"
 "                   stdout (فقط مدیر).\n"
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 "  --sources      - همه بسته‌های منابع را قبل از باگیری می‌دهد (فقط مدیر).\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
@@ -1995,17 +1932,17 @@ msgstr ""
 "  --use-distrib  - پیکربندی urpmi در هوا از درخت distrib.\n"
 "                   این پرسش یک توزیع را اجازه می‌دهد.\n"
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - چاپ ثبت تغییرات.\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - پرسش گسترده برای وابستگی‌های بسته.\n"
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -2013,56 +1950,111 @@ msgid ""
 msgstr ""
 "  -u             - برداشتن بسته اگر یک نسخه‌ی جدیدتر قبلاً نصب شده است.\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - تکمیل بیرون‌ریز با بسته‌ای که برداشته می‌شود.\n"
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - جستجوی معکوس برای آنچه بسته را لازم دارد.\n"
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -i             - اطلاعات مفید را به زبان آدمیزاد چاپ می‌کند.\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - چاپ گروه‌ها با نام.\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - چاپ نسخه و انتشار با نام.\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - پرونده‌های در بسته را فهرست می‌کند\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "نام‌ها یا پرونده‌های داده شده بر خط فرمان مورد تردید می‌باشند.\n"
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: گزینه‌ی \"-%s\" ناشناس, طرز استفاده با --help بررسی شود\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: نمی‌توان پرونده rpm \"%s\" را خواند\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes فقط می‌توانند با --parallel استفاده شود"
 
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "webfetch ناشناس `%s' !!!\n"
+
+#~ msgid "copy failed: %s"
+#~ msgstr "کپی کردن شکست خورد: %s"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "wget وجود ندارد\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "wget شکست خورد: خروج %d یا علامت %d\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "curl وجود ندارد\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "curl شکست خورد: خروج با %d یا سیگنال %d\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "rsync وجود ندارد\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "rsync شکست خورد: خروج با %d یا علامت %d\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "ssh وجود ندارد\n"
+
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpme: گزینه‌ی ناشناس \"-%s\", طرز استفاده را با --help بررسی نمایید\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpmi: گزینه‌ی ناشناس \"-%s\", طرز استفاده را با --help بررسی نمایید\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr ""
+#~ "برای ارضای وابستگی‌ها، بسته‌های بدنبال آمده نصب خواهند شد (%d مگابایت)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "احتیاجی به دادن <relative path of hdlist> با --distrib"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "<relative path of hdlist> وجود ندارد\n"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "`با' رسانه‌های شبکه که وجود ندارند\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmq: گزینه‌ی \"-%s\" ناشناس, طرز استفاده با --help بررسی شود\n"
+
 #~ msgid "no webfetch (curl or wget currently) found\n"
 #~ msgstr "هیچ webfetch (curl یا wget در حال حاضر) پیدا شد\n"
 
diff --git a/po/fi.po b/po/fi.po
index c9c07c80..d06ac02e 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-fi - MDK  10.0 Release\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2004-03-07 16:54+0200\n"
 "Last-Translator: Thomas Backlund <tmb@mandrake.org>\n"
 "Language-Team: Finnish <cooker-i18n@mandrakelinux.xom>\n"
@@ -56,22 +56,22 @@ msgstr ""
 "Pakettien automaattinen asennus...\n"
 "Lähetit pyynnön paketin %s asentamisesta\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "Sopiiko tämä?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (K/e) "
@@ -81,7 +81,7 @@ msgstr " (K/e) "
 msgid "%s: command not found\n"
 msgstr "%s: komentoa ei löytynyt\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
@@ -90,114 +90,53 @@ msgstr ""
 "käyttö: %s [optiot]\n"
 "jossa [optiot] ovat:\n"
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "  -h|--help       - tulosta tämä viesti.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "  --[group]       - rajoita annettuun ryhmään.\n"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, c-format
 msgid "                    defaults is %s.\n"
 msgstr "                  - oletus on %s.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Tuntematon webfetch '%s' !!!\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "tuntematon protokolla määrätty kohteelle %s"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "yhtäkään webfetch ei löydetty, tuetut ovat: %s\n"
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "ei voida käsitellä protokollaa: '%s'"
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "kopiointi epäonnistui: %s "
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "wget puuttuu\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget epäonnistui: lopetti arvolla %d tai signaalilla %d\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "curl puuttuu\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl epäonnistui: lopetti arvolla %d tai signaalilla %d\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "rsync puuttuu\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "rsync epäonnistui: lopetti arvolla %d tai signaalilla %d\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "ssh puuttuu\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% / %s, aika-arvio = %s, nopeus = %s"
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% valmis, nopeus = %s "
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...noutaminen epäonnistui: %s "
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "syntaksivirhe asetustiedostossa rivissä %s"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 "media \"%s\" yrittää käyttää jo käytettyä hdlist-tiedostoa, media ohitettu"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr "media \"%s\" yrittää käyttää jo käytössä olevaa listaa, media ohitettu"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -206,39 +145,39 @@ msgstr ""
 "mediaa \"%s\" ei voitu käyttää koska list-tiedosto on jo toisen median "
 "käytössä"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 "nimeä \"%s\" ei voida käyttää nimeämättömälle medialle, koska se on jo "
 "käytössä"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr "mediaa \"%s\" ei voida huomioida, koska list-tiedosto [%s| puuttuu"
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "mahdotonta määrittää tämän hdlist tiedoston [%s] mediaa"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "en voi käyttää media \"%s\" hdlist tiedosto, media ohitetaan"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "ei voida käyttää median \"%s\" list-tiedostoa, media ohitetaan"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "yritetään ohittaa olemassa olevaa mediaa \"%s\", vältetään"
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -247,93 +186,93 @@ msgstr ""
 "virtuaalisella medialla \"%s\" ei pitäisi olla määriteltynä hdlist- tai list-"
 "tiedostoa, media ohitettu"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr ""
 "virtuaalisella medialla \"%s\" pitäisi olla kunnollinen url, media ohitettu"
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "kohteelle \"%s\" ei löytynyt hdlist-tiedostoa, media ohitettu"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "kohteelle \"%s\" ei löytynyt listatiedostoa, media ohitettu"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "hajanainen list tiedosto kohteelle \"%s\", media ohitettu"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "ei voitu tarkistaa list-tiedostoa kohteelle \"%s\", media ohitettu"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "liian monta liitospistettä siirrettävälle medialle \"%s\""
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "käytetään siirettävä laite kohteena \"%s\""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "käytetään erillistä siirrettävää laitetta [%s] kohteelle \"%s\""
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "hakemiston nimeä ei voida noutaa siirrettävälle medialle \"%s\""
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "asetustiedostoon [%s] ei voitu kirjoittaa "
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "kirjoitetaan asetustiedosto [%s]"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "parallel optiota ei voida käyttää use-distrib option kanssa"
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "en voi tulkata \"%s\" tiedostossa [%s]"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "tutkitaan rinnakkaiskäsittelijän tiedostossa [%s]"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "rinnakkais-käsittelijä löydetty noodeille: %s "
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "käytetään sidotut mediat rinnakkais tapaan: %s "
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "en voi käyttää rinnakkais optiota \"%s\""
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -342,90 +281,90 @@ msgstr ""
 "--synthesis ei voida käyttää ---media, --excludemedia, --sortmedia, --update "
 "tai --parallel kanssa"
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "tutkitaan synteesitiedostoa [%s]"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "tutkitaan hdlist-tiedostoa [%s]"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "virtuaalinen media \"%s\" ei ole paikallinen, media ohitettu"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "ongelmia luettaessa hdlist- tai synthesis-tiedostoa medialle \"%s\""
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "suoritetaan toinen kierros riippuvuuksien määrittelemiseksi\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "ohitetaan paketti %s "
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "paketti %s asennettaisiin päivittämisen sijaan"
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "rpm tietokantaa ei voitu avata"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "media \"%s\" on jo olemassa"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr "virtuaalisen median on oltava paikallinen"
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "media %s lisätty"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "en voi käyttää ensimmäistä asennusmediaa"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "kopioidaan hdlists-tiedostoa ..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "... kopiointi epäonnistui"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "... kopiointi valmis"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
@@ -434,43 +373,49 @@ msgstr ""
 "ensimmäistä asennusmediaa ei voida käyttää (tiedostoa Mandrake/base/hdlists "
 "ei löydy)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "haetaan hdlists tiedostoa..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "...hakeminen valmis"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...noutaminen epäonnistui: %s "
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "virheellinen hdlist kuvaus \"%s\" hdlists tiedostossa"
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "yritettiin valita puuttuva media \"%s\""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "valitaan useampi media: %s "
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\" "
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "poistetaan mediaa \"%s\""
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -480,7 +425,7 @@ msgstr ""
 "ei voida käyttää mediaa \"%s\",\n"
 "tämä voi johtua siitä että liitit hakemiston manuaalisesti kun loit median."
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -489,224 +434,224 @@ msgstr ""
 "virtuaalisella medialla \"%s\" pitäisi olla kunnollinen lähde-hdlist tai -"
 "synthesis, media ohitettu"
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "kopioidaan \"%s\" tiedoston kuvausta"
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr ""
 "lasketaan md5sum olemassaolevalle lähde hdlist tai synthesis-tiedostolle"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "tutkitaan MD5SUM-tiedostoa"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "kopioidaan lähteen \"%s\" hdlist-tiedostoa (tai synthesis)..."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "[%s] kopiointi epäonnistui (tiedosto on epäilyttävän pieni)"
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr ""
 "lasketaan md5sum lähteestä kopioidulle hdlist- tai synthesis-tiedostolle"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "[%s] kopiointi epäonnistui (md5sum ei täsmää)"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "ongelmia luettaessa synthesis-tiedostoa medialle \"%s\""
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "luetaan rpm-tiedostoja kohteesta [%s]"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "rpm-tiedostoa [%s] ei voitu lukea medialta \"%s\""
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "rpm-tiedostoja ei löytynyt paikasta [%s]"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "haetaan lähteen hdlist (tai synthesis) kohteelta \"%s\""
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "löydettiin etsitty hdlist- tai synthesis-tiedosto nimellä %s"
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "lasketaan md5sum haetulle lähde-hdlist tai -synthesis-tiedostolle"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr "md5sum ei täsmää"
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "lähteen hdlistin (tai synteesin) noutaminen epäonnistui"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "hdlist tiedostoa ei löydetty medialle \"%s\""
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "tiedosto [%s] on jo käytössä samassa mediassa \"%s\""
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "hdlist-tiedostoa \"%s\" ei voida tulkata"
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "ei voida kirjoittaa listatiedostoa \"%s\":sta "
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "kirjoitetaan list-tiedostoa medialle \"%s\""
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "ei kirjoitettu mitään \"%s\":n listatiedostoon"
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "tarkistetaan \"%s\" pubkey tiedostoa..."
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...tuotu avain %s pubkey-tiedostosta \"%s\""
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "en voi tuoda pubkey-tiedostoa \"%s\""
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "luetaan otsikkotietoja mediasta  \"%s\""
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "rakennetaan hdlist-tiedostoa [%s]"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "rakenna hdlist-synthesis-tiedosto medialle \"%s\""
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "välimuistista löytyi %d otsikkokenttää"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "poistetaan %d ylimääräisiä otsikkotietoja välimuistista"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "liitän %s:n"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "irrotetaan liitos %s "
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "muutettiin %s kohdetta tiedostossa depslist"
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "ei kohteita muutettu tiedostossa depslist"
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "virheellinen rpm-tiedoston nimi [%s]"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "haetaan rpm tiedostoa [%s] ..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "ei oikeuksia rpm-tiedostoon [%s]"
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "rpm tiedoston rekisteröinti ei onnistunut"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "virhe rekisteröitäessä paikalliset paketit"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "ei pakettia nimeltä %s "
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Seuraavat paketit sisältävät %s: %s "
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "löytyy useita paketteja joilla on sama rpm tiedostonimi \"%s\" "
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "en voi tulkita [%s] oikein arvolla \"%s\""
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -716,144 +661,159 @@ msgstr ""
 "  peilipalvelin ei todennäköisesti ole ajan tasalla, kokeillaan "
 "vaihtoehtoista tapaa"
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "media \"%s\" ei määritä yhtäkään kohdetta rpm-tiedostoille"
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "pakettia %s ei löytynyt."
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi-tietokanta lukittu"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "mediaa \"%s\" ei ole valittu"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "rpm-tiedostoa [%s] ei voitu lukea medialta \"%s\""
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 "hajanainen media \"%s\" merkitty siirrettäväksi, vaikkei oikeastaan ole"
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "mediaa \"%s\" ei voitu käyttää"
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "väärin muodostettu syöte: [%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "haetaan rpm tiedostoja medialle \"%s\" ..."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "Valmistellaan..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "käytetään prosessia %d tehtävän suorittamiseen"
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr "luotiin tapahtuma asennukselle %s (poisto=%d, asennus=%d, päivitys=%d)"
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr "tapahtumaa ei voida luoda"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "poistetaan paketti %s "
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "en voi poistaa pakettia %s "
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "lisätään pakettia %s (id=%d, eid=%d, päivitys=%d, tiedosto=%s)"
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "en voi asentaa pakettia %s "
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "puuttuvan %s takia"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "täyttämättömän %s takia"
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr "yritetään pakottaa %s valinta "
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr "pitääkseni %s"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "asentaakseni %s"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "ristiriidan takia %s kanssa"
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr "ei pyydetty"
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Virheellinen allekirjoitus (%s)"
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "Virheellinen avain-ID (%s)"
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Allekirjoitus puuttuu (%s)"
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "virheellinen välityspalvelinmääritys komentorivissä\n"
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: ei voida lukea rpm-tiedostoa \"%s\"\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Valitan, virheellinen valinta, yritä uudelleen\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -870,41 +830,41 @@ msgstr ""
 "\n"
 "käyttö:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help          - tulosta tämä viesti.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto          - valitse automaattisesti paketit tarvittaessa.\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr "  --test          - varmista että asennusta voidaan hoitaa oikein.\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 "  --force         - pakottaa asennuksen vaikka joitakin paketteja puuttuu.\n"
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel      - urpmi jaettu yli koneita aliaksella.\n"
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root          - käytä toinen juuri rpm asennukselle.\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -913,73 +873,62 @@ msgstr ""
 "  --use-distrib   - aseta urpmi automaattisesti jakelun puusta, hyödyllinen\n"
 "                    asennettaessa chroot käyttäen --root optiota.\n"
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v              - yksityiskohtainen tyyli.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a              - valitse kaikki lausekkeeseen täsmäävät.\n"
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-"urpmi: tuntematon parametri \"-%s\", tarkista ohjelman käyttö: --help\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr "tuntemattomia paketteja "
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "tuntematon paketti"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "paketin %s poistaminen rikkoo järjestelmäsi"
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr "Ei mitään poistettavissa"
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "Suoritetaan tarkistusta seuraavien pakettien poistamiseksi"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr "Riippuvuuksien täyttämiseksi seuraavat paketit poistetaan (%d Mt)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (k/E) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "poistetaan %s "
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr "Poistaminen epäonnistui"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Valitan, virheellinen valinta, yritä uudelleen\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -996,25 +945,25 @@ msgstr ""
 "\n"
 "käyttö:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update        - käytä ainoastaan päivitysmediaa.\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 "  --media         - käytä ainoastaan seuraava(t) media(t) pilkuilla "
 "erotettuina.\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 "  --excludemedia  - älä käytä seuraava(t) media(t) pilkulla erotettuina.\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1022,19 +971,19 @@ msgstr ""
 "  --sortmedia     - lajittele mediat pilkuilla erotettujen alimerkkijonojen "
 "mukaan.\n"
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 "  --synthesis     - käytä annettua synthesis-tiedostoa urpmi tietokannan "
 "sijasta.\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose       - yksityiskohtainen tyyli.\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1045,87 +994,87 @@ msgstr ""
 "                    annettu komentorivissä, ei yhteensopiva interaktiivisen\n"
 "                    tilan kanssa).\n"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --uniq          - älä tulosta identtisiä rivejä.\n"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all           - tulosta kaikki merkinnät.\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group         - tulosta merkintä ryhmä: ryhmä.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size          - tulosta merkintä koko: koko.\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --epoch         - tulosta merkintä aikakausi: aikakausi.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary       - tulosta merkintä yhteenveto: yhteenveto.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description   - tulosta merkintä kuvaus: kuvaus.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr "  --sourcerpm     - tulosta merkintä lähdekoodi-rpm: lähdekoodi-rpm.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr "  --packager      - tulosta merkintä paketoija: paketoija.\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr "  --buildhost     - tulosta merkintä käännöskone: käännöskone.\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --url           - tulosta merkintä url: url.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr "  --provides      - tulosta merkintä tarjoaa: kaikki tarjoaa.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr "  --requires      - tulosta merkintä tarvitsee: kaikki tarvitsee.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files         - tulosta merkintä tiedostot: kaikki tiedostot.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr "  --conflicts     - tulosta merkintä ristiriita: kaikki ristiriidat.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr "  --obsoletes     - tulosta merkintä vanhentaa: vanhentaa kaikki.\n"
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
@@ -1134,25 +1083,25 @@ msgstr ""
 "  --env           - käytä määrättyä ympäristöä (yleensä virhe-\n"
 "                    raportti).\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
 "  -i              - jätä huomiotta isojen/pienten kirjasinten erottelu \n"
 "                    hakuehdoissa.\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f              - tulosta versio, julkaisu ja arkkitehtuuri myös nimellä.\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e              - sisällytä perl-koodia suoraan 'perl -e'.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
@@ -1161,7 +1110,7 @@ msgstr ""
 "lausekkeet\n"
 "                    ovat oikeat.\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
@@ -1169,22 +1118,22 @@ msgstr ""
 "  -o              - binäärinen OR operaattori, oikea jos yksi lausekkeista\n"
 "                    on oikea.\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !               - binäärinen NOT, oikea jos lauseke on väärä.\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr "  (               - vasen sulkumerkki lauseke-ryhmän avaamiseen.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr "  )               - oikea sulkumerkki lauseke-ryhmän sulkemiseen.\n"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
@@ -1193,12 +1142,12 @@ msgstr ""
 "takaisinkutsu on:\n"
 "%s \n"
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "käytetään määrättyä ympäristö kohteessa %s\n"
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1215,20 +1164,20 @@ msgstr ""
 "\n"
 "käyttö:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 "  --synthesis     - käytä annettua synthesis-tiedostoa urpmi tietokannan "
 "sijasta.\n"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select   - valitse automaattisesti päivitettävät paketit.\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
@@ -1236,7 +1185,7 @@ msgid ""
 msgstr ""
 "  --no-uninstall  - älä koskaan kysy paketin poistosta, keskeytä asennus.\n"
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1245,7 +1194,7 @@ msgstr ""
 "  --keep          - jätä olemassaolevat paketit jos mahdollista, hylkää\n"
 "                    paketit joiden asentaminen poistaisi muita.\n"
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1256,41 +1205,41 @@ msgstr ""
 "                    pakettimäärä aiotaan asentaa tai päivittää,\n"
 "                    oletus on %d.\n"
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length  - pienen tapahtuman pituus, oletus on %d.\n"
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy         - käytä epätarkka haku (sama kuin -y).\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 "  --src           - seuraava paketti on lähdekoodi-paketti (sama kuin -s).\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 "  --install-src   - asenna ainoastaan lähdekoodipaketit (ei binäärejä).\n"
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 "  --clean         - poista rpm paketti välimuistista ennen muita "
 "tapahtumia.\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean       - pidä käyttämätön rpm paketti välimuistissa.\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1299,7 +1248,7 @@ msgstr ""
 "  --allow-nodeps  - sallii pakettien asennuksen ilman\n"
 "                    riippuvuuksien tarkistusta.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1308,7 +1257,7 @@ msgstr ""
 "  --allow-force   - sallii pakettien asennuksen ilman\n"
 "                    riippuvuuksien ja ehytys-tarkistusta.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1317,22 +1266,22 @@ msgstr ""
 "  --use-distrib   - aseta urpmi automaattisesti jakelun puusta, hyödyllinen\n"
 "                    asennettaessa chroot käyttäen --root optiota.\n"
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget          - käytä wget etätiedostojen hakemiseen.\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl          - käytä curl:a etätiedostojen hakemiseen.\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate    - rajoita latausnopeutta.\n"
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1341,7 +1290,7 @@ msgstr ""
 "  --resume        - jatka osittain haettujen tiedostojen hakeminen\n"
 "                    (--no-resume poistaa käytöstä, vakiona ei käytössä).\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1351,7 +1300,7 @@ msgstr ""
 "                    oletetaan olevan 1080 (muodossa <välityspalvelin [:"
 "portti]>).\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1360,7 +1309,7 @@ msgstr ""
 "  --proxy-user    - määrittele käyttäjä ja salasana välityspalvelimen\n"
 "                    todentamisessa (muodossa <käyttäjä:salasana>).\n"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1369,12 +1318,12 @@ msgstr ""
 "  --bug           - kirjoittaa virheraportin hakemistoon joka määritellään\n"
 "                    seuraavassa argumentissa.\n"
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X             - käytä X käyttöliittymää.\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1383,7 +1332,7 @@ msgstr ""
 "  --best-output   - valitse paras käyttöliittymä ympäristön mukaan:\n"
 "                    X tai teksti tilassa.\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1392,82 +1341,70 @@ msgstr ""
 "  --verify-rpm    - varmista rpm allekirjoitusta ennen asennusta\n"
 "                    (--no-verify-rpm poistaa käytöstä, vakiona käytössä).\n"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 "  --excludepath   - jätä asentamatta seuraaviin hakemistoihin\n"
 "                    (hakemistot pikuilla erotettuna)\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs   - jätä dokumentaatio pois.\n"
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 "  -a              - valitse kaikki yhteensopivuuksia kommentojonossa.\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 "  -p              - sallii etsimisen 'tarjoaa' tiedoista paketin "
 "löytämiseksi.\n"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 "  -P              - älä etsi 'tarjoaa' tiedoista paketin löytämiseksi.\n"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y              - käytä epätarkka haku (sama kuin --fuzzy).\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 "  -s              - seuraava paketti on lähdekoodi paketti (sama kuin --"
 "src).\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q              - hiljainen tyyli.\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  komentorivillä syötetyt nimet tai rpm-tiedostot asennetaan.\n"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr "Valitse hakemisto johon tiedosto tallennetaan"
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "virheellinen välityspalvelinmääritys komentorivissä\n"
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-"urpmi: tuntematon parametri \"-%s\", tarkista ohjelman käyttö: --help\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr "Mitä voidaan tehdä binääri rpm-tiedostolla kun käytetään --install-src"
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1488,22 +1425,22 @@ msgstr ""
 "\n"
 "Mitä haluat tehdä?"
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "Ei mitään"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr "Kyllä, haluan asentaa sitä"
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr "Tallenna tiedosto"
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1518,12 +1455,12 @@ msgstr ""
 "\n"
 "Halutessasi voit myös vain tallentaa sitä. Mitä haluat tehdå?"
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, c-format
 msgid "Install it"
 msgstr "Asenna sitä"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1532,42 +1469,42 @@ msgstr ""
 "Hakemisto [%s] on jo olemassa. Ole hyvä ja valitse toinen hakemisto "
 "virheraportille tai poista sitä."
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Hakemiston [%s] luominen virheraportille ei onnistu"
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Vain pääkäyttäjä saa asentaa paketteja"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "Yksi seuraavista paketeista täytyy asentaa: %s : "
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Yksi seuraavista paketeista tarvitaan:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Mikä on valintasi? ( 1 - %d) : "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "Pakettia asennetaan..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "Alustetaan..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1576,12 +1513,12 @@ msgstr ""
 "Joitakin haluttuja paketteja ei voida asentaa:\n"
 "%s "
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr "Hyväksytkö?"
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1592,7 +1529,7 @@ msgstr ""
 "jotta toiset voidaan päivittää:\n"
 "%s \n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1601,14 +1538,14 @@ msgstr ""
 "Seuraavat paketit on poistettava jotta toiset voidaan päivittää:\n"
 "%s "
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr "Riippuvuuksien täyttämiseksi seuraavat paketit asennetaan (%d Mt)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1617,37 +1554,47 @@ msgstr ""
 "Sinun pitää olla pääkäyttäjänä asentaaksesi seuraavat riippuvuudet:\n"
 "%s \n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "lähteen paketteja ei saada, toiminto keskeytetään"
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Aseta media nimeltään \"%s\" laitteeseen [%s]"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Paina Enter kun olet valmis..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Ladataan pakettia `%s'..."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% / %s, aika-arvio = %s, nopeus = %s"
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% valmis, nopeus = %s "
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Seuraavissa paketeissa on virheelliset allekirjoitukset"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Haluatko jatkaa asennusta?"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1658,57 +1605,57 @@ msgstr ""
 "%s \n"
 "Sinun kannattaisi päivittää urpmi tietokanta"
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "Asennus epäonnistui"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr "levitetään %s "
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr "asennan %s "
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Asennetaan pakettia `%s' ( %s / %s )..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Yritä asentaa ilman riippuvuuksia? (k/E) "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Yritä asentaa pakolla (--force)? (k/E) "
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d asennustoiminnot epäonnistuivat"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "Asennus on mahdollinen"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "Kaikki on jo asennettu"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr "uudelleenkäynnistetään urpmi"
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1734,22 +1681,22 @@ msgstr ""
 "\n"
 "ja [valitsimet] ovat\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update        - luo päivitysmediaa.\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr "  --probe-synthesis - yritä etsiä ja käyttää synthesis-tiedostoa.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr "  --probe-hdlist  - yritä löytää ja käyttää hdlist-tiedostoa.\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
@@ -1758,7 +1705,7 @@ msgstr ""
 "  --no-probe      - älä yritä etsiä ja käyttää synthesis- tai hdlist-"
 "tiedostoa.\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -1766,7 +1713,7 @@ msgid ""
 msgstr ""
 "  --distrib       - luo automaattisesti kaikki mediat asennusmedioista\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1777,7 +1724,7 @@ msgstr ""
 "                    jakelusta, XXX voi olla 'main', 'contrib', 'updates'\n"
 "                    tai jotain muuta joka on jo määritetty ;-)\n"
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1787,7 +1734,7 @@ msgstr ""
 "oletus:\n"
 "                    %s\n"
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1797,7 +1744,7 @@ msgstr ""
 "  --version       - käytä määritettyä jakeluversiota, oletuksena otetaan\n"
 "                    asennetusta mandrake-release paketin versiosta.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
@@ -1807,7 +1754,7 @@ msgstr ""
 "asennetun\n"
 "                    mandrake-release paketin arkkitehtuuri.\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
@@ -1816,74 +1763,59 @@ msgstr ""
 "  --virtual       - luo virtuaalinen media, joka on aina ajantasalla,\n"
 "                    vain file:// protokolla on mahdollinen.\n"
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum     - poista tiedostojen MD5SUM tarkistusta.\n"
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c              - puhdista otsikkotietojen välimuistihakemisto.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f              - pakota hdlist-tiedostojen luominen.\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"tuntemattomat valitsimet '%s'\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "ei voida lisätä cooker jakelun päivityksiä\n"
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "haen peilipalvelinlistaa kohteesta %s ..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr ""
 "%s \n"
 "ei tarvetta antaa <hdlist:in relatiivinen polku>-kohtaa --distrib -"
 "parametrin kanssa"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "mediaa \"%s\" ei voida päivittää\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
+msgid "<relative path of hdlist> missing\n"
 msgstr ""
 "%s \n"
 "<hdlist:in relatiivinen polku> puuttuu\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
+msgid "`with' missing for network media\n"
 msgstr ""
 "%s \n"
 "verkkomedian kohta `with' puuttuu\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "mediaa \"%s\" ei voida luoda\n"
@@ -1902,6 +1834,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a              - valitse kaikki mediat.\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"tuntemattomat valitsimet '%s'\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1916,7 +1857,7 @@ msgstr ""
 "Poistettava kohta puuttuu\n"
 "(yksi seuraavista: %s)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1925,27 +1866,27 @@ msgstr ""
 "käyttö: urpmi.update [valitsimet] <nimi> ...\n"
 "jossa <nimi> on päivitettävän median nimi.\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update        - käytä ainoastaan päivitysmediaa.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr "  --force-key     - pakota gpg avaimen päivitys.\n"
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a              - valitse kaikki ei-siirrettävät mediat.\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "ei mitään päivitettävää (käytä urpmi.addmedia lisätäksesi median)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1954,7 +1895,7 @@ msgstr ""
 "Päivitettävä kohta puuttuu\n"
 "(yksi seuraavista: %s)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1971,41 +1912,41 @@ msgstr ""
 "\n"
 "käyttö:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list          - listaa käytettävissä olevat paketit.\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media    - listaa käytettävissä olevat mediat.\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr ""
 "  --list-url      - listaa käytettävissä olevat mediat ja niiden polut.\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr "  --dump-config   - tulosta asetukset urpmi.addmedia muodossa.\n"
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 "  --list-nodes    - listaa käytettävissä olevat noodit käytettäessä --"
 "parallel.\n"
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases  - listaa käytettävissä rinnakkais-aliakset.\n"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
@@ -2014,13 +1955,13 @@ msgstr ""
 "  --headers       - purkaa otsikkotiedot urpmi tietokannan pakettilistasta\n"
 "                    näytölle (ainoastaan pääkäyttäjänä).\n"
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr "  --sources       - listaa kaikki lähdekoodipaketit ennen hakeminen.\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
@@ -2029,18 +1970,18 @@ msgstr ""
 "  --use-distrib   - aseta urpmi automaattisesti jakelun puusta.\n"
 "                    Tämä sallii etsiminen jakelusta.\n"
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog     - tulosta muutosloki.\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 "  -d              - laajenna haku sisältämään pakettien riippuvuuksia.\n"
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -2048,55 +1989,111 @@ msgid ""
 msgstr ""
 "  -u              - poista paketti jos uudempi versio on jo asennettu.\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c              - täydellinen tuloste poistettavasta paketista.\n"
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 "  -R              - käänteinen etsiminen 'vaatii' tiedoista paketeissa.\n"
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 "  -i              - tulosta hyödyllistä tietoa ihmisen luettavassa "
 "muodossa.\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g              - tulosta ryhmät myös nimellä.\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r              - tulosta versio ja julkaisu myös nimellä.\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l              - listaa paketissa olevia tiedostoja.\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  komentorivillä syötetyt nimet tai rpm-tiedostot etsitään.\n"
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: tuntematon valitsin \"-%s\", tarkista ohjelman käyttö: --help\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: ei voida lukea rpm-tiedostoa \"%s\"\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes voidaan ainoastaan käyttää --parallel kanssa"
+
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "Tuntematon webfetch '%s' !!!\n"
+
+#~ msgid "copy failed: %s"
+#~ msgstr "kopiointi epäonnistui: %s "
+
+#~ msgid "wget is missing\n"
+#~ msgstr "wget puuttuu\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "wget epäonnistui: lopetti arvolla %d tai signaalilla %d\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "curl puuttuu\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "curl epäonnistui: lopetti arvolla %d tai signaalilla %d\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "rsync puuttuu\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "rsync epäonnistui: lopetti arvolla %d tai signaalilla %d\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "ssh puuttuu\n"
+
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpmi: tuntematon parametri \"-%s\", tarkista ohjelman käyttö: --help\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpmi: tuntematon parametri \"-%s\", tarkista ohjelman käyttö: --help\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr "Riippuvuuksien täyttämiseksi seuraavat paketit asennetaan (%d Mt)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s \n"
+#~ "ei tarvetta antaa <hdlist:in relatiivinen polku>-kohtaa --distrib -"
+#~ "parametrin kanssa"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s \n"
+#~ "<hdlist:in relatiivinen polku> puuttuu\n"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s \n"
+#~ "verkkomedian kohta `with' puuttuu\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpmq: tuntematon valitsin \"-%s\", tarkista ohjelman käyttö: --help\n"
diff --git a/po/fr.po b/po/fr.po
index bc649703..31680352 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2004-02-10 23:51+0100\n"
 "Last-Translator: Didier Hérisson <didier.herisson@angstrom.uu.se>\n"
 "Language-Team: Français <fr@li.org>\n"
@@ -62,22 +62,22 @@ msgstr ""
 "Installation automatique des paquetages...\n"
 "Vous avez demandé l'installation du paquetage %s\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "Est-ce correct ?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Annuler"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (O/n) "
@@ -87,7 +87,7 @@ msgstr " (O/n) "
 msgid "%s: command not found\n"
 msgstr "%s : commande non trouvée\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
@@ -96,116 +96,55 @@ msgstr ""
 "usage : %s [options]\n"
 "où les [options] sont parmi\n"
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - afficher ce message d'aide\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "   -g [groupe]    - restreindre les résultats au groupe spécifié.\n"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, c-format
 msgid "                    defaults is %s.\n"
 msgstr "                    le défaut en est %s.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Programme inconnu de rapatriement de pages web « %s » !!!\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "protocole inconnu défini pour %s"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 "aucun programme de rapatriement de pages web trouvé, ceux supportés sont: %"
 "s\n"
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "impossible d'utiliser le protocole : %s"
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "échec de la copie : %s"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "wget n'est pas installé\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget a échoué : sorti avec le code %d ou tué par le signal %d\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "curl n'est pas installé\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "échec de curl : sorti avec %d ou tué par le signal %d\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "« rsync » non trouvé\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "échec de rsync : sorti avec %d ou tué par le signal %d\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "ssh est manquant\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% sur %s, temps total = %s, vitesse = %s"
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% complèté, vitesse = %s"
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...échec de la récupération : %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "erreur de syntaxe dans le fichier de configuration à la ligne %s"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr "le média « %s » essaye d'utiliser un hdlist déjà utilisé, média ignoré"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 "le média « %s » essaye d'utiliser une liste déjà utilisée, média ignoré"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -214,41 +153,41 @@ msgstr ""
 "impossible de tenir compte de « %s » car la liste de fichiers est déjà "
 "utilisée par un autre média"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 "impossible d'utiliser le nom « %s » pour le média non nommé car ce nom est "
 "déjà utilisé"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 "impossible de prendre en compte le média « %s » car il n'existe aucun "
 "fichier de liste [%s]"
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "impossible de déterminer le média de ce fichier hdlist [%s]"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "impossible d'accéder au fichier hdlist de « %s »; média ignoré"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "impossible d'accéder au fichier de liste de « %s »; média ignoré"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "tentative d'ignorer le média existant « %s »; abandon"
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -257,93 +196,93 @@ msgstr ""
 "le média virtuel « %s » ne devrait pas avoir de liste de fichier ou de "
 "hdlist, média ignoré"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "le média virtuel « %s » devrait avoir une url claire, média ignoré"
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "impossible de trouver le fichier hdlist pour « %s »; média ignoré"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "impossible de trouver le fichier liste de « %s »; média ignoré"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "fichier de liste incohérent pour « %s », média ignoré"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "impossible de consulter le fichier de liste pour « %s »; média ignoré"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "trop de points de montage pour le média amovible « %s »"
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "périphérique amovible pris en tant que « %s »"
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "utilisation de différents périphériques amovibles [%s] pour « %s »"
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "impossible d'accéder au chemin du média amovible « %s »"
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "impossible d'écrire le fichier de configuration [%s]"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "écriture du fichier de configuration [%s]"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 "Le mode « parallel » ne peut pas être utiliser avec le mode « use-distrib »"
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "impossible d'analyser « %s » dans le fichier [%s]"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "examen du support distribué dans le fichier [%s]"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "support distribué trouvé pour les noeuds : %s"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "utilisation du média associé pour le mode distribué : %s"
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "impossible d'utiliser l'option distribuée « %s »"
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -352,90 +291,90 @@ msgstr ""
 "--synthesis ne peut pas être utilisé avec --media, --excludemedia, --"
 "sortmedia, --update ou --parallel"
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "examen de la liste de synthèse [%s]"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "examen du fichier hdlist [%s]"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "le média virtuel « %s » n'est pas local, média ignoré"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "problème de lecture du fichier hdlist ou de synthèse du média « %s »"
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "seconde exécution pour calculer les dépendances\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "paquetage %s ignoré"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "effectuerait une installation plutôt qu'une mise à jour de %s"
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "impossible d'ouvrir la base de donnée rpm"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "le média « %s » existe déjà"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr "Le média virtuel doit être local"
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "média %s ajouté"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "impossible d'accéder au premier média d'installation"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "copie du fichier hdlists..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "...copie impossible"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "...copie effectuée"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
@@ -444,43 +383,49 @@ msgstr ""
 "impossible d'accéder au premier média d'installation (pas de fichier "
 "Mandrake/base/hdlists)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "récupération du fichier hdlists..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "...récupération effectuée"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...échec de la récupération : %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "description « %s »  invalide dans le fichier des hdlists"
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "essai de sélection du média inexistant « %s »"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "sélection de plusieurs médias : %s"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "« %s »"
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "enlever le média « %s »"
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -491,7 +436,7 @@ msgstr ""
 "cela peut arriver si vous avez effectué un montage manuel lors de la "
 "création du média."
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -500,231 +445,231 @@ msgstr ""
 "le média virtuel « %s » devrait avoir un fichier hdlist ou de synthèse "
 "valide, média ignoré"
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "copie du fichier description de « %s »"
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr ""
 "calcul de la somme de contrôle MD5sum du fichier hdlist (ou de synthèse) "
 "existant"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "examen du fichier de somme de contrôle MD5sum"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "copie du hdlist source (ou synthèse) de « %s »..."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
 "La copie de [%s] a échoué ( Le fichier est si petit que c'en est suspect )"
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr ""
 "calcul de la somme de contrôle MD5sum du fichier hdlist copié (ou de sa "
 "synthèse)"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr ""
 "la copie de [%s] a échoué ( disparité entre les sommes de contrôle md5sum )"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "problème de lecture du fichier de synthèse du média « %s »"
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "lecture des fichiers rpm à partir de [%s]"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "impossible de lire les fichiers rpm à partir de [%s] : %s"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "pas de fichier rpm trouvé pour [%s]"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "récupération du hdlist source (ou synthèse) de « %s »..."
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "hdlist source (ou synthèse) potentiel trouvé en tant que %s"
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr ""
 "calcul de la somme de contrôle MD5sum du fichier hdlist (ou de synthèse) "
 "téléchargé"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr "La somme de contrôle MD5sum ne correspond pas"
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "la récupération du hdlist source (ou synthèse) a échoué"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "pas de fichier hdlist trouvé pour le média « %s »"
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "le fichier [%s] est déjà utilisé sur le même support « %s »"
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "impossible d'analyser le fichier hdlist de « %s »"
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "impossible d'écrire le fichier de liste « %s »"
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "Écriture de la liste des fichiers pour le média « %s »"
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "rien n'a été écrit dans le fichier de liste pour « %s »"
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "examen du fichier de la clé publique de « %s »..."
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...clé %s importée à partir du fichier de la clé publique de « %s »"
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "impossible d'importer le fichier de la clé publique de « %s »"
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "lecture des en-têtes du média « %s »"
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "création du fichier hdlist [%s]"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "fichier de synthèse créé pour le média « %s »"
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "%d en-têtes trouvés dans le cache"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "destruction de %d en-têtes obsolètes dans le cache"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "montage de %s"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "démontage de %s"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "%s entrées déplacées dans la depslist"
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "pas d'entrée déplacée dans la depslist"
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "le nom du fichier rpm est invalide [%s]"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "récupération des fichiers rpm [%s]..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "impossible d'accéder au fichier rpm [%s]"
 
 # c-format
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "impossible de référencer le fichier rpm"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "erreur lors de l'inscription des paquetages locaux"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "pas de paquetage nommé %s"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Les paquetages suivants contiennent %s : %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "il y a plusieurs paquetages avec le même nom de fichier « %s »"
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "impossible d'analyser correctement [%s] pour la valeur « %s »"
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -734,62 +679,62 @@ msgstr ""
 "  le site mirroir n'est probablement pas à jour. Essai d'une méthode "
 "alternative en cours..."
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "Le média « %s » ne définit aucun emplacement pour les fichiers rpm"
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "paquetage %s non trouvé"
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "base de données urpmi vérouillée"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "le média « %s » n'est pas sélectionné"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "impossible de lire le fichier rpm [%s] depuis le média « %s »"
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "média incohérent « %s », marqué amovible mais sans l'être réellement"
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "impossible d'accéder au média « %s »"
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "entrée incorrecte : [%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "récupération des fichiers rpm à partir de « %s »..."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "Préparation..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "Utilisation du processus %d pour exécuter la transaction"
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -797,82 +742,97 @@ msgstr ""
 "Transaction créée pour l'installation sur %s (remove=%d, install=%d, upgrade="
 "%d)"
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr "impossible de créer la transaction"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "désinstallation du paquetage %s"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "impossible d'enlever le paquetage %s"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "ajout du paquetage %s (id=%d, eid=%d, update=%d, file=%s)"
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "impossible d'installer le paquetage %s"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "en raison du manque de %s"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "car %s  est non satisfait"
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr "Tentative de promouvoir %s"
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr "afin de garder %s"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "pour installer le paquetage %s"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "en raison de conflit avec %s"
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr "non demandé"
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Signature incorrecte (%s)"
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "Identifiant de clef incorrect (%s)"
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Signature absente (%s)"
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "Mauvaise déclaration de proxy en ligne de commande\n"
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq : impossible de lire le fichier rpm « %s »\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Désolé, mauvais choix, veuillez réessayer\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -889,27 +849,27 @@ msgstr ""
 "\n"
 "usage :\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - afficher ce message d'aide\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 "  --auto         - sélectionner automatiquement un paquetage parmi les "
 "choix\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 "  --test         - vérifier si l'installation fonctionne correctement.\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
@@ -918,19 +878,19 @@ msgstr ""
 "n'existent\n"
 "                   pas.\n"
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - urpmi distribué sur plusieurs machines d'alias.\n"
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr ""
 "  --root         - utiliser un autre répertoire racine pour l'installation "
 "du rpm.\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -940,76 +900,66 @@ msgstr ""
 "                   distribution, utile pour (dés)installer un chroot avec\n"
 "                   l'option --root.\n"
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - mode verbeux.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 "  -a             - sélectionne toutes les paquetages correspondants à\n"
 "                   l'expression\n"
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme : option « -%s » inconnue, vérifiez l'usage avec --help\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr "paquetages inconnus"
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "paquetage inconnu"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "La désinstallation du paquetage %s rendra votre système instable"
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr "Rien à désinstaller"
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "Vérification pour la désinstallation des paquetages suivants"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
 "Pour satisfaire les dépendances, les paquetages suivants vont être "
 "désinstallés (%d Mo)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (o/N) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "désinstallation de %s"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr "Échec de la désinstallation"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Désolé, mauvais choix, veuillez réessayer\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1026,26 +976,26 @@ msgstr ""
 "\n"
 "usage :\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - n'utiliser que les média de mise à jour.\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 "  --media        - utiliser seulement les média listés (séparés par des\n"
 "                   virgules).\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 "  --excludemedia - ne pas utiliser les média spécifiés (séparés\n"
 "                   par des virgules).\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1053,19 +1003,19 @@ msgstr ""
 "  --sortmedia    - trier les média selon des sous-chaînes (séparées\n"
 "                   par des virgules).\n"
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - utiliser le fichier de synthèse donné plutôt que la base\n"
 "                   de données urpmi.\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - mode verbeux.\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1075,93 +1025,93 @@ msgstr ""
 "  --quiet        - ne pas afficher le nom des champs (actif par défaut,\n"
 "                   incompatible avec le mode interactif).\n"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --uniq         - ne pas afficher les lignes identiques.\n"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all           - afficher tous les champs.\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group        - afficher le champ « group » : groupe.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size         - afficher le champ « size » : taille.\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --epoch        - afficher le champ « epoch » : série.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary      - afficher le champ « summary » : résumé.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description  - afficher le champ « description » : description.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr "  --sourcerpm    - afficher le champ « sourcerpm » : source rpm.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr ""
 "  --packager     - afficher le champ « packager » : créateur du paquetage.\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr "  --buildhost    - afficher le champ « buildhost » : build host.\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --url          - afficher le champ url : url.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr ""
 "  --provides      - afficher le champ « provides » : tous les apports.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr ""
 "  --requires     - afficher le champ « requires » : toutes les dépendances.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files        - afficher le champ « files » : tous les fichiers.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr ""
 "  --conflicts    - afficher le champ « conflicts » : tous les conflits.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr ""
 "  --obsoletes    - afficher le champ « obsoletes » : toutes les "
 "obsolescences.\n"
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
@@ -1170,24 +1120,24 @@ msgstr ""
 "  --env          - utiliser un environment spécifique (en général\n"
 "                   un rapport de bogue).\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr "  -i             - ignorer la distinction de case.\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - affiche la version, la release et l'architecture\n"
 "                   du paquetage avec le nom\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - inclure du code perl directement.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
@@ -1195,31 +1145,31 @@ msgstr ""
 "  -a             - opérateur binaire ET, vrai si les deux expressions sont\n"
 "                   vraies.\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 "  -o             - opérateur binaire OU, vrai si une expression est vraie.\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - NON unaire, vrai si l'expression est fausse.\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
 "  (              - parenthèse gauche pour ouvrir un groupe d'expression.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
 "  )              - parenthèse droite pour fermer un groupe d'expression.\n"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
@@ -1228,12 +1178,12 @@ msgstr ""
 "Le callback est :\n"
 "%s\n"
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "avec environnement spécifique sur %s\n"
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1250,21 +1200,21 @@ msgstr ""
 "\n"
 "usage :\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - utiliser le fichier de synthèse donné plutôt que la base\n"
 "                   de données urpmi.\n"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 "  --auto-select  - sélection automatique des paquetages à mettre à jour.\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
@@ -1273,7 +1223,7 @@ msgstr ""
 "  --no-uninstall - ne jamais demander de désinstallation, plutôt annuler "
 "l'installation.\n"
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1283,7 +1233,7 @@ msgstr ""
 "les paquetages demandés\n"
 "                   qui nécessitent des désinstallations.\n"
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1295,43 +1245,43 @@ msgstr ""
 "                   de paquetages doivent être installés ou mis à jour.\n"
 "                   (%d par défaut).\n"
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 "  --split-length - longueur de la petite transaction (%d par défaut).\n"
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - imposer la recherche floue (identique à -y).\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 "  --src          - le prochain paquetage est un paquetage source\n"
 "                   (identique à -s).\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 "  --install-src  - n'installer que les paquetages-source (pas les "
 "binaires).\n"
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 "  --clean        - enlever tous les rpm du cache avant toute opération.\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - garder les rpm non utilisés dans le cache.\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1340,7 +1290,7 @@ msgstr ""
 "  --allow-nodeps - permet à l'utilisateur qui le demande d'installer\n"
 "                   des paquetages sans vérifier les dépendances.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1350,7 +1300,7 @@ msgstr ""
 "                   paquetages sans vérifier ni les dépendances ni "
 "l'intégrité.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1360,24 +1310,24 @@ msgstr ""
 "                   distribution, utile pour (dés)installer un chroot avec\n"
 "                   l'option --root.\n"
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 "  --wget         - utiliser wget pour récupérer les fichiers distants.\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 "  --curl         - utiliser curl pour récupérer les fichiers distants.\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - limiter la vitesse de téléchargement.\n"
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1388,7 +1338,7 @@ msgstr ""
 "                   (--no-resume le désactive, le choix par défaut est "
 "désactivé).\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1398,7 +1348,7 @@ msgstr ""
 "                   étant 1080 à défaut d'indication (format <proxy[:port]"
 ">).\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1408,7 +1358,7 @@ msgstr ""
 "                   l'authentification proxy (format <utilisateur:"
 "motdepasse>).\n"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1417,12 +1367,12 @@ msgstr ""
 "  --bug          - délivrer un rapport de bogue dans le répertoire\n"
 "                   indiqué en second argument.\n"
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - utiliser l'interface graphique (X11)\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1431,7 +1381,7 @@ msgstr ""
 "  --best-output  - choisir la meilleure interface en fonction de\n"
 "                   l'environnement : mode graphique ou textuel.\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1440,85 +1390,74 @@ msgstr ""
 "  --verify-rpm   - vérifier la signature du rpm avant l'installation.\n"
 "                   (--no-verify-rpm désactive la vérification).\n"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 "  --excludepath  - exclure les chemins indiqués, séparés par des virgules.\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - exclut les fichiers de documentation.\n"
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 "  -a             - sélectionne toutes les correspondances de la ligne de\n"
 "                   commande.\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 "  -p             - cherche dans les apports pour trouver le paquetage.\n"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 "  -P             - ne pas chercher dans les apports pour trouver un "
 "paquetage.\n"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - imposer la recherche floue (identique à --fuzzy).\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 "  -s             - le prochain paquetage est un paquetage source\n"
 "                   (identique  --src).\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - mode peu verbeux.\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 "  les noms ou les fichiers rpm donnés en ligne de commande seront "
 "installés.\n"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr "Choisissez un emplacement pour enregistrer le fichier."
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "Mauvaise déclaration de proxy en ligne de commande\n"
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi : option « -%s » inconnue, vérifiez l'usage avec --help\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 "Ce qui peut être fait avec les fichiers binaires rpm avec l'option --install-"
 "src"
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1540,22 +1479,22 @@ msgstr ""
 "\n"
 "Que voulez vous faire ?"
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "Ne rien faire"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr "Oui, l'installer vraiment."
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr "Enregistrer le fichier"
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1571,12 +1510,12 @@ msgstr ""
 "\n"
 "Peut-être préférez-vous simplement les enregistrer. Quel est votre choix ?"
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, c-format
 msgid "Install it"
 msgstr "L'installer"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1585,42 +1524,42 @@ msgstr ""
 "Le répertoire [%s] existe déjà, merci d'en utiliser un autre pour le rapport "
 "de bogue, ou de l'effacer."
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Impossible de créer le répertoire [%s] pour le rapport de bogue"
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Seul l'administrateur système (root) peut installer des paquetages"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "L'un des paquetages suivants est nécessaire pour installer %s :"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Un des paquetages suivants est nécessaire :"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Que choisissez-vous ? (1-%d)"
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "Installation du paquetage..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "Initialisation..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1629,12 +1568,12 @@ msgstr ""
 "Certains paquetages demandés ne peuvent pas être installés :\n"
 "%s"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr "Êtes-vous d'accord ?"
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1645,7 +1584,7 @@ msgstr ""
 "doivent être désinstallés :\n"
 "%s\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1655,16 +1594,16 @@ msgstr ""
 "désinstallés :\n"
 "%s"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
 "Pour satisfaire les dépendances, les paquetages suivants vont être installés "
 "(%d Mo)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1673,37 +1612,47 @@ msgstr ""
 "Vous devez être root pour installer les dépendances suivantes :\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "impossible de récupérer les paquetages sources, abandon"
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Veuillez insérer le média nommé « %s » dans le périphérique [%s]"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Appuyez sur la touche Entrée quand vous êtes prêt..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "téléchargement du paquetage %s"
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% sur %s, temps total = %s, vitesse = %s"
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% complèté, vitesse = %s"
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Les paquetages suivants ont des signatures non valides"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Voulez-vous continuer l'installation ?"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1714,57 +1663,57 @@ msgstr ""
 "%s\n"
 "Vous devriez mettre à jour votre base de données urpmi"
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "L'installation a échoué"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr "distribution de %s"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr "installation de %s"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Installation du paquetage « %s » (%s/%s)..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Essayer d'installer sans vérifier les dépendances ? (o/N) "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Essayer de forcer l'installation (--force) ? (o/N) "
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d transactions d'installation ont échoué"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "L'installation est possible"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "Tout est déjà installé"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr "Redémarrage de urpmi"
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1789,25 +1738,25 @@ msgstr ""
 "\n"
 "et [options] sont issues de\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - créer un média de mise à jour.\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
 "  --probe-synthesis - essayer de trouver et d'utiliser un fichier de "
 "synthèse.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr ""
 "  --probe-hdlist - essayer de trouver et d'utiliser un fichier hdlist.\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
@@ -1816,7 +1765,7 @@ msgstr ""
 "  --no-probe     - ne pas essayer de trouver un fichier hdlist\n"
 "                   ou de synthèse.\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -1825,7 +1774,7 @@ msgstr ""
 "  --distrib      - créer automatiquement tous les médias à partir\n"
 "                   d'un média d'installation.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1837,7 +1786,7 @@ msgstr ""
 "                   contrib (contributions), updates (mises à jour)\n"
 "                   ou n'importe quoi d'autre qui a été configuré ;-)\n"
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1847,7 +1796,7 @@ msgstr ""
 "défaut\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1858,7 +1807,7 @@ msgstr ""
 "est\n"
 "                   donnée par le paquetage « mandrake-release ».\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
@@ -1868,7 +1817,7 @@ msgstr ""
 "par\n"
 "                   le paquetage mandrake-release.\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
@@ -1877,77 +1826,56 @@ msgstr ""
 "  --virtual      - créer un média virtuel qui est toujours à jour,\n"
 "                   seul le protocole « file:// » est autorisé.\n"
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 "  --no-md5sum    - Supprime la vérification de la somme de contrôle "
 "(MD5SUM).\n"
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - purger le répertoire cache des en-têtes.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - forcer la génération des fichiers hdlist.\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"option inconnue '%s'\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 "Ne peut ajouter des mises à jour sur une distribution "
 "« cooker » (« betas »)\n"
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "récupération des mirroirs depuis %s ..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"inutile de spécifier  le <chemin relatif de hdlist> avec --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "inutile de spécifier  le <chemin relatif de hdlist> avec --distrib"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "impossible de mettre à jour le média « %s »\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"<chemin relatif de hdlist> manquant\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<chemin relatif de hdlist> manquant\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"directive « with » manquante pour les médias en réseau\n"
+msgid "`with' missing for network media\n"
+msgstr "directive « with » manquante pour les médias en réseau\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "impossible de créer le média « %s »\n"
@@ -1966,6 +1894,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - sélectionne toutes les medias\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"option inconnue '%s'\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1980,7 +1917,7 @@ msgstr ""
 "L'entrée à retirer est manquante\n"
 " (l'une parmi %s)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1989,27 +1926,27 @@ msgstr ""
 "Utillisation : urpmi.update [options] <nom> ...\n"
 "où <nom> est un nom de média à mettre à jour.\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - ne rafraîchir que les médias de mise à jour.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr "  --force-key    - force la mise à jour de la clef gpg.\n"
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - sélectionne tous les médias non amovibles\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "rien à mettre à jour (utiliser urpmi.addmedia pour ajouter un média)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2018,7 +1955,7 @@ msgstr ""
 "l'entrée à mettre à jour est manquante\n"
 "(un parmi de %s)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -2035,22 +1972,22 @@ msgstr ""
 "\n"
 "usage :\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - montrer tous les paquetages disponibles.\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - montrer tous les médias disponibles.\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url   - montrer tous les médias disponibles et leurs URL.\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
@@ -2058,19 +1995,19 @@ msgstr ""
 "  --dump-config  - renvoie la configuration sous forme d'un argument\n"
 "                   pour urpmi.addmedia.\n"
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 "  --list-nodes   - montrer tous les noeuds disponibles en.\n"
 "                   utilisant --parallel.\n"
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - lister les alias parallèles disponibles.\n"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
@@ -2080,7 +2017,7 @@ msgstr ""
 "urpmi\n"
 "                   vers la sortie standard (root seulement).\n"
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
@@ -2088,7 +2025,7 @@ msgstr ""
 "  --sources      - donner tous les paquetages sources avant de télécharger.\n"
 "                   (root seulement).\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
@@ -2097,17 +2034,17 @@ msgstr ""
 "  --use-distrib  - configure urpmi à la volée d'après l'arbre d'une\n"
 "                   distribution, permettant d'interroger une distribution.\n"
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - imprime le changelog.\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - étend la requête aux dépendances du paquetage.\n"
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -2116,63 +2053,117 @@ msgstr ""
 "  -u             - enlève le paquetage si une version plus récente est déjà\n"
 "                   installée.\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 "  -c             - sortie sur la ligne de commande avec les\n"
 "                   noms des paquetages à désinstaller.\n"
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 "  -R             - recherche inversée des items nécessitant ce paquetage.\n"
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 "  -i             - affiche des informations utiles dans une forme "
 "compréhensible.\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - afficher les groupes ainsi que les noms\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - affiche la version détaillée ainsi que le nom.\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - liste les fichiers d'un paquetage.\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 "  les noms ou fichiers rpm indiqués sur la ligne de commandes sont "
 "intérrogés.\n"
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq : option « -%s » inconnue, vérifiez l'usage avec --help\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq : impossible de lire le fichier rpm « %s »\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes peut seulement être utilisé avec --parallel"
 
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "Programme inconnu de rapatriement de pages web « %s » !!!\n"
+
+#~ msgid "copy failed: %s"
+#~ msgstr "échec de la copie : %s"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "wget n'est pas installé\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "wget a échoué : sorti avec le code %d ou tué par le signal %d\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "curl n'est pas installé\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "échec de curl : sorti avec %d ou tué par le signal %d\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "« rsync » non trouvé\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "échec de rsync : sorti avec %d ou tué par le signal %d\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "ssh est manquant\n"
+
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpme : option « -%s » inconnue, vérifiez l'usage avec --help\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmi : option « -%s » inconnue, vérifiez l'usage avec --help\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr ""
+#~ "Pour satisfaire les dépendances, les paquetages suivants vont être "
+#~ "installés (%d Mo)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "inutile de spécifier  le <chemin relatif de hdlist> avec --distrib"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "<chemin relatif de hdlist> manquant\n"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "directive « with » manquante pour les médias en réseau\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmq : option « -%s » inconnue, vérifiez l'usage avec --help\n"
+
 #~ msgid "no webfetch (curl or wget currently) found\n"
 #~ msgstr ""
 #~ "aucun programme de rapatriement de pages web (curl ou wget) trouvé\n"
diff --git a/po/ga.po b/po/ga.po
index 7adb21d3..23e116f0 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2000-04-06 10:25+0100\n"
 "Last-Translator: Proinnsias Breathnach <breatpro@dublin.ml.com>\n"
 "Language-Team: Gaeilge <ga@li.org>\n"
@@ -47,22 +47,22 @@ msgid ""
 "You requested installation of package %s\n"
 msgstr ""
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "An bhfuil sin Ok ?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "Ceart go Leor"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Cealaigh"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (T/n) "
@@ -72,382 +72,327 @@ msgstr " (T/n) "
 msgid "%s: command not found\n"
 msgstr ""
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "where [options] are from\n"
 msgstr ""
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr ""
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr ""
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, c-format
 msgid "                    defaults is %s.\n"
 msgstr ""
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr ""
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr ""
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr ""
 
-#: ../urpm.pm:189
-#, fuzzy, c-format
-msgid "copy failed: %s"
-msgstr "Theip ar feistiú"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr ""
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr ""
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr ""
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr ""
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr ""
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr ""
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr ""
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr ""
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr ""
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, fuzzy, c-format
-msgid "...retrieving failed: %s"
-msgstr "léamh depslist comhad [%s]"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, fuzzy, c-format
 msgid "syntax error in config file at line %s"
 msgstr "Tá droch ainmchomad rpm [%s]"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
 "medium"
 msgstr ""
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, fuzzy, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr "Tá droch ainmchomad rpm [%s]"
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, fuzzy, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "Tá droch ainmchomad rpm [%s]"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, fuzzy, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
 "ignored"
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, fuzzy, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, fuzzy, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, fuzzy, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr ""
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, fuzzy, c-format
 msgid "unable to write config file [%s]"
 msgstr "Tá droch ainmchomad rpm [%s]"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, fuzzy, c-format
 msgid "write config file [%s]"
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, fuzzy, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "Tá droch ainmchomad rpm [%s]"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, fuzzy, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, fuzzy, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr ""
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr ""
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
 "update or --parallel"
 msgstr ""
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, fuzzy, c-format
 msgid "examining synthesis file [%s]"
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, fuzzy, c-format
 msgid "examining hdlist file [%s]"
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, fuzzy, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr ""
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, fuzzy, c-format
 msgid "skipping package %s"
 msgstr "pacáiste ar bith den ainm %s"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr ""
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr ""
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr ""
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr ""
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr ""
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, fuzzy, c-format
 msgid "copying hdlists file..."
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, fuzzy, c-format
 msgid "...copying failed"
 msgstr "Theip ar feistiú"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr ""
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
 "found)"
 msgstr ""
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, fuzzy, c-format
 msgid "retrieving hdlists file..."
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr ""
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, fuzzy, c-format
+msgid "...retrieving failed: %s"
+msgstr "léamh depslist comhad [%s]"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, fuzzy, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr ""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr ""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, fuzzy, c-format
 msgid "removing medium \"%s\""
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -455,372 +400,387 @@ msgid ""
 "medium."
 msgstr ""
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
 "ignored"
 msgstr ""
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, fuzzy, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, fuzzy, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, fuzzy, c-format
 msgid "examining MD5SUM file"
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, fuzzy, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, fuzzy, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, fuzzy, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "Téip cóip do [%s]"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, fuzzy, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, fuzzy, c-format
 msgid "reading rpm files from [%s]"
 msgstr "Tá droch ainmchomad rpm [%s]"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, fuzzy, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "Tá droch ainmchomad rpm [%s]"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, fuzzy, c-format
 msgid "no rpm files found from [%s]"
 msgstr "Tá droch ainmchomad rpm [%s]"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, fuzzy, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, fuzzy, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr ""
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, fuzzy, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, fuzzy, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "Tá droch ainmchomad rpm [%s]"
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, fuzzy, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "Tá droch ainmchomad rpm [%s]"
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, fuzzy, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, fuzzy, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, fuzzy, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, fuzzy, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "Tá droch ainmchomad rpm [%s]"
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, fuzzy, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "Tá droch ainmchomad rpm [%s]"
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, fuzzy, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, fuzzy, c-format
 msgid "building hdlist [%s]"
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, fuzzy, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr ""
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "ag feistiú %s"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, fuzzy, c-format
 msgid "unmounting %s"
 msgstr "ag feistiú %s"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr ""
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "Tá droch ainmchomad rpm [%s]"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, fuzzy, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, fuzzy, c-format
 msgid "unable to register rpm file"
 msgstr "Tá droch ainmchomad rpm [%s]"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr ""
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "pacáiste ar bith den ainm %s"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr ""
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, fuzzy, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "Tá droch ainmchomad rpm [%s]"
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
 "  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr ""
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr ""
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr ""
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr ""
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, fuzzy, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "Tá droch ainmchomad rpm [%s]"
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr ""
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, fuzzy, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr ""
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr ""
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, fuzzy, c-format
 msgid "unable to create transaction"
 msgstr "Tá droch ainmchomad rpm [%s]"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, fuzzy, c-format
 msgid "removing package %s"
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr ""
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr ""
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr ""
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr ""
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr ""
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr ""
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr ""
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr ""
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr ""
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr ""
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr ""
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr ""
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr ""
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr ""
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Droch-rogha, athtrialaigh!\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -831,112 +791,102 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr ""
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr ""
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-
-#: ../urpme:91
+#: ../urpme:83
 #, fuzzy, c-format
 msgid "unknown packages"
 msgstr "pacáiste ar bith den ainm %s"
 
-#: ../urpme:91
+#: ../urpme:83
 #, fuzzy, c-format
 msgid "unknown package"
 msgstr "pacáiste ar bith den ainm %s"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr ""
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr ""
 
-#: ../urpme:107
+#: ../urpme:99
 #, fuzzy, c-format
 msgid "Checking to remove the following packages"
 msgstr "Tá ceann de na pacáistí seo de dhíth:"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, fuzzy, c-format
 msgid " (y/N) "
 msgstr " (T/n) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, fuzzy, c-format
 msgid "removing %s"
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr ""
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Droch-rogha, athtrialaigh!\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -947,38 +897,38 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr ""
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -986,148 +936,148 @@ msgid ""
 "                   line, incompatible with interactive mode).\n"
 msgstr ""
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr ""
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr ""
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr ""
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr ""
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr ""
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr ""
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr ""
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr ""
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr ""
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr ""
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr ""
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr ""
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr ""
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr ""
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr ""
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
 msgstr ""
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
 "%s\n"
 msgstr ""
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1138,32 +1088,32 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr ""
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that leads to remove.\n"
 msgstr ""
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1171,186 +1121,175 @@ msgid ""
 "                   default is %d.\n"
 msgstr ""
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr ""
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
 msgstr ""
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
 msgstr ""
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
 "                   X or text mode.\n"
 msgstr ""
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr ""
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr ""
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr ""
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1363,22 +1302,22 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr ""
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr ""
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr ""
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1388,66 +1327,66 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, fuzzy, c-format
 msgid "Install it"
 msgstr "Theip ag feistiú"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr ""
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr ""
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr ""
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, fuzzy, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "Tá ceann de na pacáistí seo de dhíth:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Tá ceann de na pacáistí seo de dhíth:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Céard é do rogha? (1-%d) "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr ""
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr ""
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr ""
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1455,58 +1394,68 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
 msgstr "Tá %s ins na pacáistí a leanas: %s \n"
 
-#: ../urpmi:561 ../urpmi:570
+#: ../urpmi:488 ../urpmi:497
 #, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
 "%s\n"
 msgstr ""
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, fuzzy, c-format
 msgid "Press Enter when ready..."
 msgstr "Brú Enter nuair atá sin déanta agat..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, fuzzy, c-format
 msgid "Downloading package `%s'..."
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr ""
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr ""
+
+#: ../urpmi:606
 #, fuzzy, c-format
 msgid "The following packages have bad signatures"
 msgstr "Tá %s ins na pacáistí a leanas: %s \n"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr ""
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1514,57 +1463,57 @@ msgid ""
 "You may want to update your urpmi database"
 msgstr ""
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "Theip ag feistiú"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, fuzzy, c-format
 msgid "distributing %s"
 msgstr "ag feistiú %s\n"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, fuzzy, c-format
 msgid "installing %s"
 msgstr "ag feistiú %s\n"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr ""
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr ""
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "Theip ag feistiú"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, fuzzy, c-format
 msgid "Installation is possible"
 msgstr "Theip ar feistiú"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "tá gach rud ann cheana féin"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr ""
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1579,36 +1528,36 @@ msgid ""
 "and [options] are from\n"
 msgstr ""
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
 "                   hdlist file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1616,14 +1565,14 @@ msgid ""
 "                   anything else that has been configured ;-)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr ""
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1631,79 +1580,66 @@ msgid ""
 "                   installed mandrake-release package.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
 "                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, fuzzy, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr ""
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr ""
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
+msgid "<relative path of hdlist> missing\n"
 msgstr ""
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
+msgid "`with' missing for network media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr ""
@@ -1720,6 +1656,13 @@ msgstr "Úsáid: urpmi.removemedia [-a] <ainm>..."
 msgid "  -a             - select all media.\n"
 msgstr ""
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1732,41 +1675,41 @@ msgid ""
 "(one of %s)\n"
 msgstr ""
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
 msgstr ""
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr ""
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr ""
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
 "(one of %s)\n"
 msgstr ""
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1777,124 +1720,118 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr ""
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr ""
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr ""
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr ""
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr ""
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr ""
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr ""
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr ""
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr ""
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr ""
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr ""
 
+#, fuzzy
+#~ msgid "copy failed: %s"
+#~ msgstr "Theip ar feistiú"
+
 #~ msgid "urpmf version %s"
 #~ msgstr "urpmg leagan %s"
 
diff --git a/po/gl.po b/po/gl.po
index 48b35633..fd1e561c 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2000-05-09 23:50+0200\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -48,22 +48,22 @@ msgid ""
 "You requested installation of package %s\n"
 msgstr ""
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "¿Está ben?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "Aceptar"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (S/n) "
@@ -73,382 +73,327 @@ msgstr " (S/n) "
 msgid "%s: command not found\n"
 msgstr ""
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "where [options] are from\n"
 msgstr ""
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr ""
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr ""
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, c-format
 msgid "                    defaults is %s.\n"
 msgstr ""
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr ""
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr ""
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr ""
 
-#: ../urpm.pm:189
-#, fuzzy, c-format
-msgid "copy failed: %s"
-msgstr "A instalación fallou"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr ""
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr ""
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr ""
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr ""
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr ""
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr ""
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr ""
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr ""
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr ""
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, fuzzy, c-format
-msgid "...retrieving failed: %s"
-msgstr "Só se lle permite ó superusuario instalar paquetes locais"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, fuzzy, c-format
 msgid "syntax error in config file at line %s"
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
 "medium"
 msgstr ""
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr ""
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
 "ignored"
 msgstr ""
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, fuzzy, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, fuzzy, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr ""
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, fuzzy, c-format
 msgid "unable to write config file [%s]"
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, fuzzy, c-format
 msgid "write config file [%s]"
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr ""
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr ""
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr ""
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr ""
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, fuzzy, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
 "update or --parallel"
 msgstr ""
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr ""
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr ""
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, fuzzy, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr ""
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, fuzzy, c-format
 msgid "skipping package %s"
 msgstr "non hai ningún paquete co nome %s\n"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, fuzzy, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr ""
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr ""
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr ""
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr ""
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr ""
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, fuzzy, c-format
 msgid "...copying failed"
 msgstr "A instalación fallou"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr ""
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
 "found)"
 msgstr ""
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, fuzzy, c-format
 msgid "retrieving hdlists file..."
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr ""
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, fuzzy, c-format
+msgid "...retrieving failed: %s"
+msgstr "Só se lle permite ó superusuario instalar paquetes locais"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, fuzzy, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr ""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr ""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, fuzzy, c-format
 msgid "removing medium \"%s\""
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -456,372 +401,387 @@ msgid ""
 "medium."
 msgstr ""
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
 "ignored"
 msgstr ""
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, fuzzy, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr ""
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, fuzzy, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, fuzzy, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "A instalación fallou"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, fuzzy, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, fuzzy, c-format
 msgid "reading rpm files from [%s]"
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr ""
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr ""
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, fuzzy, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, fuzzy, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr ""
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, fuzzy, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, fuzzy, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, fuzzy, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, fuzzy, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, fuzzy, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, fuzzy, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, fuzzy, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, fuzzy, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, fuzzy, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr ""
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, fuzzy, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr ""
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, fuzzy, c-format
 msgid "mounting %s"
 msgstr "instalando %s\n"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, fuzzy, c-format
 msgid "unmounting %s"
 msgstr "instalando %s\n"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr ""
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, fuzzy, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, fuzzy, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr ""
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr ""
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, fuzzy, c-format
 msgid "no package named %s"
 msgstr "non hai ningún paquete co nome %s\n"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, fuzzy, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Os seguintes paquetes conteñen %s: %s\n"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, fuzzy, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
 "  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr ""
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr ""
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "a petición á base de datos rpm fallou\n"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr ""
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, fuzzy, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, fuzzy, c-format
 msgid "unable to access medium \"%s\""
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr ""
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, fuzzy, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr ""
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr ""
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr ""
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, fuzzy, c-format
 msgid "removing package %s"
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, fuzzy, c-format
 msgid "unable to remove package %s"
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr ""
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, fuzzy, c-format
 msgid "unable to install package %s"
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr ""
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr ""
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, fuzzy, c-format
 msgid "in order to keep %s"
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, fuzzy, c-format
 msgid "in order to install %s"
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr ""
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr ""
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr ""
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr ""
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr ""
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr ""
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr ""
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Mala elección, probe de novo\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -832,114 +792,104 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr ""
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr ""
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-
-#: ../urpme:91
+#: ../urpme:83
 #, fuzzy, c-format
 msgid "unknown packages"
 msgstr "non hai ningún paquete co nome %s\n"
 
-#: ../urpme:91
+#: ../urpme:83
 #, fuzzy, c-format
 msgid "unknown package"
 msgstr "non hai ningún paquete co nome %s\n"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr ""
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr ""
 
-#: ../urpme:107
+#: ../urpme:99
 #, fuzzy, c-format
 msgid "Checking to remove the following packages"
 msgstr "Necesítase un dos seguintes paquetes:"
 
-#: ../urpme:114
+#: ../urpme:106
 #, fuzzy, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
 "Para satisfacer as dependencias, os seguintes paquetes van ser instalados (%"
 "d MB)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, fuzzy, c-format
 msgid " (y/N) "
 msgstr " (S/n) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, fuzzy, c-format
 msgid "removing %s"
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr ""
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Mala elección, probe de novo\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -950,38 +900,38 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr ""
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -989,148 +939,148 @@ msgid ""
 "                   line, incompatible with interactive mode).\n"
 msgstr ""
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr ""
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr ""
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr ""
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr ""
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr ""
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr ""
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr ""
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr ""
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr ""
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr ""
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr ""
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr ""
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr ""
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr ""
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr ""
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
 msgstr ""
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
 "%s\n"
 msgstr ""
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1141,32 +1091,32 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr ""
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that leads to remove.\n"
 msgstr ""
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1174,186 +1124,175 @@ msgid ""
 "                   default is %d.\n"
 msgstr ""
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr ""
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
 msgstr ""
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
 msgstr ""
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
 "                   X or text mode.\n"
 msgstr ""
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr ""
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr ""
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr ""
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1366,22 +1305,22 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr ""
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr ""
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr ""
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1391,66 +1330,66 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, fuzzy, c-format
 msgid "Install it"
 msgstr "A instalación fallou"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr ""
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr ""
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, fuzzy, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, fuzzy, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "Necesítase un dos seguintes paquetes:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Necesítase un dos seguintes paquetes:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "¿Cal é a súa elección? (1-%d) "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr ""
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr ""
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr ""
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1458,60 +1397,70 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
 msgstr "Os seguintes paquetes conteñen %s: %s\n"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
 "Para satisfacer as dependencias, os seguintes paquetes van ser instalados (%"
 "d MB)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
 "%s\n"
 msgstr ""
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Por favor, insira o %s nomeado %s"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, fuzzy, c-format
 msgid "Press Enter when ready..."
 msgstr "Prema enter cando estea..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, fuzzy, c-format
 msgid "Downloading package `%s'..."
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr ""
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr ""
+
+#: ../urpmi:606
 #, fuzzy, c-format
 msgid "The following packages have bad signatures"
 msgstr "Os seguintes paquetes conteñen %s: %s\n"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr ""
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1519,57 +1468,57 @@ msgid ""
 "You may want to update your urpmi database"
 msgstr ""
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "A instalación fallou"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, fuzzy, c-format
 msgid "distributing %s"
 msgstr "instalando %s\n"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, fuzzy, c-format
 msgid "installing %s"
 msgstr "instalando %s\n"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "¿Probar a instalación sen comprobar as dependencias? (s/N) "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "¿Probar a instalación con menos comprobacións (--force)? (s/N) "
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "A instalación fallou"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, fuzzy, c-format
 msgid "Installation is possible"
 msgstr "A instalación fallou"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "xa está todo instalado"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr ""
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1584,36 +1533,36 @@ msgid ""
 "and [options] are from\n"
 msgstr ""
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
 "                   hdlist file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1621,14 +1570,14 @@ msgid ""
 "                   anything else that has been configured ;-)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr ""
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1636,79 +1585,66 @@ msgid ""
 "                   installed mandrake-release package.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
 "                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, fuzzy, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr ""
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr ""
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
+msgid "<relative path of hdlist> missing\n"
 msgstr ""
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
+msgid "`with' missing for network media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr ""
@@ -1725,6 +1661,13 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr ""
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1737,41 +1680,41 @@ msgid ""
 "(one of %s)\n"
 msgstr ""
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
 msgstr ""
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr ""
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr ""
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
 "(one of %s)\n"
 msgstr ""
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1782,123 +1725,124 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr ""
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr ""
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr ""
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr ""
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr ""
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr ""
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr ""
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr ""
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr ""
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: ../urpmq:160
+#: ../urpmq:147
 #, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgid "--list-nodes can only be used with --parallel"
 msgstr ""
 
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr ""
+#, fuzzy
+#~ msgid "copy failed: %s"
+#~ msgstr "A instalación fallou"
 
-#: ../urpmq:216
-#, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr ""
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr ""
+#~ "Para satisfacer as dependencias, os seguintes paquetes van ser instalados "
+#~ "(%d MB)"
 
 #, fuzzy
 #~ msgid "Installation failed on node %s"
diff --git a/po/he.po b/po/he.po
index 3c30a4dc..05b4de69 100644
--- a/po/he.po
+++ b/po/he.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2004-03-28 20:16+0200\n"
 "Last-Translator: dovix <dovix2003@yahoo.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -58,22 +58,22 @@ msgstr ""
 "התקנה אוטומטית של החבילות ... \n"
 "ביקשת התקנה של החבילות %s\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "האם זה בסדר?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "אישור"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "ביטול"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr "אישור/ביטול (*כ/ל) "
@@ -83,7 +83,7 @@ msgstr "אישור/ביטול (*כ/ל) "
 msgid "%s: command not found\n"
 msgstr "%sפקודה לא נמצאה \n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
@@ -92,332 +92,272 @@ msgstr ""
 "שימוש: %s [options]\n"
 "כאשר [options] הם מתוך\n"
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - הצגת הודעת עזרה זו.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "   -g [group]     - הגבלת התוצאות לקבוצה (group) מסויימת.\n"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, c-format
 msgid "                    defaults is %s.\n"
 msgstr "                    ברירת המחדל היא %s.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "webfetch לא ידוע `%s' !!!\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "פרוטוקול לא מזוהה הוגדר עבור %s"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "לא נמצא webfetch מבין אלו הנתמכים: %s\n"
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "השימוש בפרוטוקול : %s נכשל"
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "העתקה נכשלה: %s"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "חסר wget\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget נכשל: סיים עם %d או סיגנל %d\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "חסר curl\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "הפעלת curl נכשלה עקב סיום עם %d או איתות %d\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "חסר rsync\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "rsync failed: exited with %d or signal %d\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "חסר ssh\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% of %s הושלם זמן הגעה= %s, מהירות= %s"
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% הושלם, מהירות = %s"
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...האיחזור נכשל: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "התגלתה שגיאה בשורה %s בקובץ ההגדרות"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr "מאגר \"%s\" מנסה להשתמש ב-hdlist שכבר בשימוש, התעלמות מאגר"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr "המאגר \"%s\" מנסה להשתמש ברשימה שכבר בשימוש, מתעלם ממאגר"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
 "medium"
 msgstr "לא ניתן להגדיר מקור \"%s\" מאחר וקובץ הרשימה כבר נמצא בשימוש מקור אחר"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"unable to use name \"%s\" for unnamed medium because it is already used"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr "אין אפשרות לקחת את המאגר \"%s\" בחשבון כאשר רשימת הקבצים [%s] לא קיימת"
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "אין אפשרות לקבוע מאגר של קובץ ה-hdlist [%s] הזה"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "אין אפשרות לגשת לקובץ hdlist של \"%s\", מדיה זו לא תהיה בשימוש"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "אין אפשרות גישה לקובץ הרשימה של \"%s\", מדיה זו לא תהיה בשימוש"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "מנסה לדלג על המקור הנוכחי \"%s\", מתחמק"
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
 "ignored"
 msgstr "מאגר וירטואלי \"%s\" לא הגדיר  hdlist או רשימת קבצים, התעלמות מאגר"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "מאגר וירטואלי \"%s\" צריך שיהיה לו כתובת ברורה, התעלמות מאגר"
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "אין אפשרות למצוא קובץ hdlist עבור \"%s\", התעלמות מאגר"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "אין אפשרות למצוא קובץ רשימה עבור \"%s\", התעלמות מאגר"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "רשימת קבצים לא רציפה \"%s\", התעלמות מאגר"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "אין אפשרות לבחון את רשימת הקבצים \"%s\", התעלמות מאגר"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "יותר מדי נקודות חיבור עבור מאגר נייד \"%s\""
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "לוקח התקן נייד כ - \"%s\""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "משתמש בהתקן נייד אחר [%s] עבור \"%s\""
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "אין אפשרות לייבא את המסלול עבור מאגר הניתנת להסרה \"%s\""
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "כתיבת קובץ ההגדרות [%s] נכשלה"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "כתיבת קובץ הגדרות [%s]"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "אין אפשרות להפעיל אופן מקבילי ביחד עם אופן פעולה use-distrib"
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "אין אפשרות לפענח את \"%s\" בקובץ [%s]"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "בודק את המזהה המקבילי בקובץ [%s]"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr ""
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "משתמש במדיה מקושרת עבור מצב מקבילי: %s"
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "אין אפשרות להשתמש באפשרות המקבילה \"%s\""
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
 "update or --parallel"
 msgstr ""
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "בודק את קובץ הsynthesis [%s]"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "בודק את הקובץ hdlist [%s]"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "מאגר וירטואלי \"%s\" לא מקומי, התעלמות מאגר"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "בעיה בקריאת hdlist או קובץ מיזוג של המאגר \"%s\""
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "מבצע מעבר שני בכדי לחשב תלויות\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "מדלג על חבילה %s"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "האם להתקין במקום לשדרג את החבילה %s"
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "אין אפשרות לפתוח את בסיס הנתונים של החבילות rpmdb"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "המאגר \"%s\" כבר קיים"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr "מאגר וירטואלי צריך להיות מקומי"
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "מאגר %s הוסף"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "אין אפשרות גישה למאגר ההתקנה הראשון"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "מעתיק קובץ hdlists..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "...ההעתקה נכשלה"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "...ההעתקה הסתיימה"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
@@ -426,43 +366,49 @@ msgstr ""
 "גישה להתקנה הראשונה של המאגר בלתי אפשרות (הקובץ Mandrake/base/hdlists לא "
 "נמצא)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "מאחזר את הקובץ hdlists ..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "...האחזור הסתיים"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...האיחזור נכשל: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "ניסיון לבחור במאגר שאינו קיים \"%s\""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "בוחר הרבה מדיה:%s"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "מסיר מאגר \"%s\""
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -472,229 +418,230 @@ msgstr ""
 "אין אפשרות לגשת למאגר \"%s\",\n"
 "זה יכול לקרות אם היית מחובר ידנית לספרייה בזמן יצירת המאגר."
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
 "ignored"
-msgstr "מאגר וירטואלי \"%s\" צריך שיהיה לו מקור hdlist או מיזוג בר תוקף, מתעלם ממאגר"
+msgstr ""
+"מאגר וירטואלי \"%s\" צריך שיהיה לו מקור hdlist או מיזוג בר תוקף, מתעלם ממאגר"
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "מעתיק תיאור קובץ של \"%s\"..."
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "מחשב MD5SUM של hdlist (או synthesis) של המקור"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "בודק את קובץ החתימות MD5SUM"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "מעתיק מקור hdlist (או מיזוג) של \"%s\"..."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "חישוב md5sum של מקור hdlist (או synthesis) מועתקים"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "העתקת [%s] נכשלה (חתימת md5sum אינה תואמת)"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "בעיה בקריאת קובץ מיזוג של מאגר \"%s\""
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "מייבא חבילות מ [%s]"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "אין אפשרות לקרוא את קובצי ה-RPM מ [%s]: %s"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "לא נמצאו חבילות מ [%s]"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "נמצא hdlist (או מיזוג) בחון כ-%s"
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr ""
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr "אי התאמה של md5sum"
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "אחזור של רשימת hdlist (או synthesis) נכשל"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "לא נמצאו קובצי hdlist עבור מאגר \"%s\""
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "הקובץ [%s] כבר משומש באותו מאגר \"%s\""
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "אין אפשרות לפענח את קובץ ה-hdlist של \"%s\""
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "אין אפשרות לכתוב את קובץ הרשימה של \"%s\""
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "כותב קובץ רשימה עבור מאגר \"%s\""
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "לא נכתב דבר ברשימת הקובץ עבור \"%s\""
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "בודק קובץ מפתחות ציבורי של \"%s\"..."
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr ".. מפתח %s מיובא מתוך קובץ ציבורי של \"%s\""
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "לא יכול לייבוא קובץ של מפתח ציבורי של \"%s\""
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "קורא כותרות מתוך מאגר \"%s\""
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "בונה hdlist [%s]"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "נמצאו %d כותרים במטמון"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "מסיר %d ספקי כותרות במטמון"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "מחבר את %s"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "מנתק את %s"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr ""
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "שם החבילה [%s] אינו תקין"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "מאחזר קובץ RPM [%s]..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "הגישה לחבילה [%s] נכשלה"
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "אין אפשרות לבצע רישום של החבילה"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "חלה שגיאה בעת רישום חבילות מקומיות"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "לא נמצאה חבילה בשם %s"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "The following packages contain %s: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "ישנן הרבה חבילות RPM עם אותו שם קובץ \"%s\""
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "פענוח [%s] נכשל בערך \"%s\""
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -703,142 +650,158 @@ msgstr ""
 "מאגר \"%s\" משתמש בקובץ רשימה לא תקף:\n"
 "  המראה קרוב לוודאי לא עדכנית, נסה להשתמש בשיטה חלופית"
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "מאגר \"%s\" לא הגדיר מיקום כלשהו עבור קובצי RPM"
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "החבילה %s לא נמצאה."
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "בסיס הנתונים של urpmi נעול"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "מאגר \"%s\" לא נבחר"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "אין אפשרות לקרוא את קובץ ה-RPM [%s] מ \"%s\""
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "מאגר לא רציף \"%s\" מסומן כניתן למחיקה אבל לא באמת"
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "הגישה למדיה \"%s\" נכשלה"
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "קלט לא תקין: [%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "הכנה..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "משתמש בתהליך %d כדי לבצע את הפעולה"
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr "יצר עסקה עבור התקנה על %s (הסרה=%d, התקנה=%d, עדכון=%d)"
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr "בלתי אפשרי לעשות עסקה"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "מסיר חבילה %s"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "הסרת החבילה %s נכשלה"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "מוסיף חבילה %s (id=%d, eid=%d, עדכון=%d, קובץ=%s)"
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "התקנת החבילה %s נכשלה"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "עקב %s חסר"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "עקב תלות %s שלא מולאה"
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr "מנסה לקדם %s"
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr "בכדי לשמור %s"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "בכדי להתקין %s"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "עקב התנגשות עם %s"
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr "לא התבקש"
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "חתימה לא תקפה (%s)"
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "מפתח זהות לא תקין (%s)"
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "חתימה חסרה (%s)"
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "הכרזת proxy לא תקנית בשורת הפקודה\n"
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: לא יכול קובץ RPM \"%s\"\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "מצטער ,בחירה רעה, יש לנסות שנית\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -854,110 +817,102 @@ msgstr ""
 "\n"
 "שימוש:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - הצגת הודעת עזרה זו.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - בחירה אוטומטית של חבילה מהאפשרויות.\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
-msgid "  --test         - verify if the installation can be achieved correctly.\n"
+msgid ""
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr "  --test         - וידוי שהתקנת החבילה יכולה להסתיים בהצלחה.\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
-msgid "  --force        - force invocation even if some packages do not exist.\n"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr ""
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - verbose mode.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - בחירת כל החבילות עם ביטוי מתאים.\n"
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: אפשרות לא ידועה \"-%s\", בדוק שימוש עם --help\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr "חבילות לא מוכרות"
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "חבילה לא מוכרת"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "הסרת החבילה %s תגרום נזק למערכת"
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr "שום-דבר למחיקה"
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "בדיקה להסרה של החבילות הבאות"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr "בכדי לענות על התלויות, החבילות הבאות יימחקו (%d MB)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (כן/*לא) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "מסיר %s"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr "ההסרה נכשלה"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "מצטער ,בחירה רעה, יש לנסות שנית\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -974,37 +929,38 @@ msgstr ""
 "\n"
 "שימוש:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       -שימוש במאגר העדכונים בלבד.\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - שימוש ברשימת המקורות המופרדים ע\"י פסיק בלבד\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - do not use the given media, separated by comma.\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
-msgid "  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr "  --sortmedia    - מיון מדיה בהתאם לכותרות משנה המופרדים ע\"י פסיק.\n"
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr "  --synthesis    - השתמש במיזוג שניתן במקום urpmi db.\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - verbose mode.\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1014,134 +970,137 @@ msgstr ""
 "  --quiet        - אל תדפיס את שם התג (ברירת מחדל אם שום תג לא ניתן בשורת\n"
 "                   הפקודה, ההפך ממצב אינראקטיבי).\n"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --uniq         - לא מדפיס שורות זהות.\n"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all          - print all tags.\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group        - הדפסת קבוצת התג: קבוצה.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size         - הדפסת גודל התג: גודל.\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --epoch        - הדפסת תקופת התג: תקופה.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary      - print tag summary: summary.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description  - הדפסת תיאור התג: תיאור.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr ""
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr "  --packager     - הדפסת אורז התג: אורז.\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr ""
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --url          - print tag url: url.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr "  --provides     - print tag provides: all provides.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr "  --requires     - הדפסת דרישות התג: כל הדרישות.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files        - הדפסת קובצי התג: כל הקבצים.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr "  --conflicts    - print tag conflicts: all conflicts.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
 msgstr ""
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr "  -i             - ignore case distinctions in every pattern.\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - הדפסת גרסה, שחרור וארכיון עם שם.\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - include perl code directly as perl -e.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
-msgid "  -a             - binary AND operator, true if both expression are true.\n"
+msgid ""
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr "  -a             - אופרטור AND בינארי, אמת אם שני הביטויים הם אמת.\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
-msgid "  -o             - binary OR operator, true if one expression is true.\n"
-msgstr "  -o             - binary OR operator, true if one expression is true.\n"
+msgid ""
+"  -o             - binary OR operator, true if one expression is true.\n"
+msgstr ""
+"  -o             - binary OR operator, true if one expression is true.\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - שלילה של מרכיב, אמת אם ביטוי הוא שקר.\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr "  (              - סוגר שמאלי כדי לפתוח קבוצת ביטויים.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr "  )              - סוגר ימני כדי לסגור קבוצת ביטויים.\n"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
@@ -1150,12 +1109,12 @@ msgstr ""
 "הקריאה היא :\n"
 "%s\n"
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "שימוש בסביבה מסוימת על  %s\n"
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1171,24 +1130,27 @@ msgstr ""
 "\n"
 "שימוש:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
-msgid "  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select  - automatically select packages to upgrade the system.\n"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
-msgstr "  --no-uninstall - לעולם אל תבקש להסיר התקנה של חבילה, בטל את ההתקנה.\n"
+msgstr ""
+"  --no-uninstall - לעולם אל תבקש להסיר התקנה של חבילה, בטל את ההתקנה.\n"
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1197,7 +1159,7 @@ msgstr ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that leads to remove.\n"
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1208,37 +1170,37 @@ msgstr ""
 "                   are going to be installed or upgraded,\n"
 "                   default is %d.\n"
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - החבילה הבאה היא חבילת מקור (אותו הדבר כמו -s).\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - install only source package (no binaries).\n"
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - remove rpm from cache before anything else.\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - keep rpm not used in cache.\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1247,7 +1209,7 @@ msgstr ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1256,36 +1218,36 @@ msgstr ""
 "  --allow-force  - מאפשר לתשאל את המשתמש אודות התקנת חבילות\n"
 "                   בלי בדיקת תלויות.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - use wget to retrieve distant files.\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - use curl to retrieve distant files.\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - limit the download speed.\n"
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1294,7 +1256,7 @@ msgstr ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1303,19 +1265,19 @@ msgstr ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
 msgstr ""
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - use X interface.\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1324,80 +1286,69 @@ msgstr ""
 "  --best-output  - choose best interface according to the environment:\n"
 "                   X or text mode.\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - exclude path separated by comma.\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr ""
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - select all matches on command line.\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - allow search in provides to find package.\n"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - do not search in provides to find package.\n"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - impose fuzzy search (same as --fuzzy).\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s             - החבילה הבאה היא חבילת מקור (אותו הדבר כמו --src).\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - מצב שקט.\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr " שמות או קובצי RPM שניתנו בשורת הפקודה יותקנו.\n"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr "עליך לבחור מקום לשמירת הקובץ"
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "הכרזת proxy לא תקנית בשורת הפקודה\n"
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: unknown option \"-%s\", check usage with --help\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr "מה יכול להיעשות עם קובצי RPM כשמשתמשים --install-src"
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1410,22 +1361,22 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "אל תעשה כלום"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr "כן, אנא התקן זאת"
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr "שמירת הקובץ"
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1435,54 +1386,54 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, c-format
 msgid "Install it"
 msgstr "התקנן זאת"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr ""
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "יצירת הספרייה. [%s] עבור דיווחי תקלות נכשלה"
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "רק משתמש בעל הרשאות משתמש-על מורשה להתקין חבילות"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "אחת החבילות הבאות נדרשת להתקנת %s:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "אחת החבילות הבאות נדרשת:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "מה היא בחירתך? (1-%d)"
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "התקנת חבילה..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "מאתחל..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1491,12 +1442,12 @@ msgstr ""
 "לא יכול להתקין כמה חבילות מבוקשות:\n"
 "%s"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr "האם אתה מסכים ?"
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1507,7 +1458,7 @@ msgstr ""
 "יש צורך להסיר אותן, בכדי לשדרג את האחרות:\n"
 "%s\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1516,14 +1467,14 @@ msgstr ""
 "החבילות הבאות עומדות להימחק בכדי שניתן יהיה לשדרג חבילות אחרות: \n"
 "%s"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr "בכדי לספק את התלויות, החבילות הבאות יותקנו (%d MB)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1532,37 +1483,47 @@ msgstr ""
 "יש צורך בהרשאות מנהל מערכת בכדי להתקין את התלויות הבאות: \n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "אין אפשרות לקרוא חבילות מהמאגר, הפעולה מתבטלת"
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "נא להכניס את המדיה הנקראת \"%s\"  להתקן [%s]"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "נא להקיש Enter"
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "מוריד חבילה `%s'..."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% of %s הושלם זמן הגעה= %s, מהירות= %s"
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% הושלם, מהירות = %s"
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "לחבילות הבאות יש בעיה בחתימות"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "האם להמשיך בתהליך ההתקנה?"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1573,57 +1534,57 @@ msgstr ""
 "%s\n"
 "יתכן ועליך לעדכן את מאגר הנתונים של urpmi"
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "ההתקנה נכשלה"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr "מפיץ %s"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr "מתקין %s"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "מתקין חבילה `%s' (%s/%s)..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "האם לנסות להתקין ללא בדיקת תלויות? (כן/*לא)"
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "האם לנסות להתקין תוך אילוץ תלויות (--force)? (כן/לא) "
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d עסקת התקנה נכשלה"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "Installation is possible"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "הכל כבר מותקן"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr ""
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1648,22 +1609,22 @@ msgstr ""
 "\n"
 "and [options] are from\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - הגדרת מאגר עדכון.\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
@@ -1672,14 +1633,14 @@ msgstr ""
 "  --no-probe     - do not try to find any synthesis or\n"
 "                   hdlist file.\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr "  --distrib      - יצירה אוטומטית של כל המקורות מתקליטורי ההתקנה\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1690,7 +1651,7 @@ msgstr ""
 "                   הפצה, XXX יכול להיות ראשי, תרומה, עדכון או\n"
 "                   כל דבר אחר שהוגדר ;-)\n"
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1699,7 +1660,7 @@ msgstr ""
 "  --from         - השתמש בכתובת מרשימת השרתים, ברירת המחדל הוא \n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1707,7 +1668,7 @@ msgid ""
 "                   installed mandrake-release package.\n"
 msgstr "d.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
@@ -1716,7 +1677,7 @@ msgstr ""
 "  --arch         - השתמש בארכיטקטורה מסוימת, ברירת המחדל היא\n"
 "                   mandrake-release package installed.\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
@@ -1725,73 +1686,52 @@ msgstr ""
 "  --virtual      - יצירת מדיה וירטואלית שתמיד עדכנית,\n"
 "                   רק פרוטוקול file:// מורשה.\n"
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - ניקוי ספריית מטמון כותרים.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"unknown options '%s'\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "לא יכול להוסיף עדכונים של הפצת cooker\n"
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "מאחזר אתרי מראה ב- %s ..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "no need to give <relative path of hdlist> with --distrib"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "עדכון המאגר \"%s\" נכשל\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"חסר <relative path of hdlist>\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "חסר <relative path of hdlist>\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"`with' חסר עבור מדית רשת\n"
+msgid "`with' missing for network media\n"
+msgstr "`with' חסר עבור מדית רשת\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "הוספת המאגר \"%s\" נכשל\n"
@@ -1810,6 +1750,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - select all media.\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"unknown options '%s'\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1824,7 +1773,7 @@ msgstr ""
 "שום כניסה המיועדת להסרה אינה חסרה\n"
 "(אחד מ %s)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1833,27 +1782,27 @@ msgstr ""
 "שימוש: urpmi.update [options] <name> ...\n"
 "כאשר <name> הינו שם המדיה המיודעת לעדכון.\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - update only update media.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr ""
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - בחירת כל המדיות שאינן ניתנות להסרה.\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "אין מה לעדכן (יש להשתמש ב urpmi.addmedia לצורך הוספת מאגר)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1862,7 +1811,7 @@ msgstr ""
 "לא חסרה שום כניסה המיועדת לעדכון\n"
 "(אחד מ %s)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1878,37 +1827,38 @@ msgstr ""
 "\n"
 "שימוש:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - list available packages.\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - list available media.\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - הצגת מאגרי עדכון זמינים ואת כתובתם.\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
-msgid "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr "  --list-nodes   - list available nodes when using --parallel.\n"
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - list available parallel aliases.\n"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
@@ -1917,82 +1867,134 @@ msgstr ""
 "  --headers      - תמצית כותרות עבור חבילות רשומות עבור urpmi db to\n"
 "                   stdout (רק מנהל מערכת).\n"
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
-msgid "  --sources      - give all source packages before downloading (root only).\n"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr "  --sources      -נותן כל חבילות המקור לפני הורדה (רק מנהל מערכת).\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr ""
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr "  -u             - הסרת חבילה אם גרסה מאוחרת יותר כבר מותקנת.\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -a             - בחירת כל החבילות עם ביטוי מתאים.\n"
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr ""
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - print version and release with name also.\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr ""
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  שמות או קובצי RPM שניתנו בשורת הפקודה נמצאים בסימן שאלה.\n"
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: אפשרות לא ידועה \"-%s\", בדוק שימוש עם --help\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: לא יכול קובץ RPM \"%s\"\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr ""
 
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "webfetch לא ידוע `%s' !!!\n"
+
+#~ msgid "copy failed: %s"
+#~ msgstr "העתקה נכשלה: %s"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "חסר wget\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "wget נכשל: סיים עם %d או סיגנל %d\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "חסר curl\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "הפעלת curl נכשלה עקב סיום עם %d או איתות %d\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "חסר rsync\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "rsync failed: exited with %d or signal %d\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "חסר ssh\n"
+
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpme: אפשרות לא ידועה \"-%s\", בדוק שימוש עם --help\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmi: unknown option \"-%s\", check usage with --help\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr "בכדי לספק את התלויות, החבילות הבאות יותקנו (%d MB)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "חסר <relative path of hdlist>\n"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "`with' חסר עבור מדית רשת\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmq: אפשרות לא ידועה \"-%s\", בדוק שימוש עם --help\n"
diff --git a/po/hi.po b/po/hi.po
index 3330db04..a6c21686 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-hi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2004-03-08 16:11+0530\n"
 "Last-Translator: धनञ्जय शर्मा (Dhananjaya Sharma) <dysxhi@yahoo.co.in>\n"
 "Language-Team: हिन्दी, भारत (Hindi, India) <dysxhi@yahoo.co.in>\n"
@@ -51,22 +51,22 @@ msgstr ""
 "पैकेजों का स्वचालित संसाधन...\n"
 "आपने %s पैकेजों के संसाधन का आग्रह किया है\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "क्या यह ठीक है?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "ओ०के०"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "निरस्त"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr "(हाँ/ना:Y/n)"
@@ -76,7 +76,7 @@ msgstr "(हाँ/ना:Y/n)"
 msgid "%s: command not found\n"
 msgstr "%s: निर्देश नहीं मिला\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
@@ -85,117 +85,56 @@ msgstr ""
 "उपयोगिता: %s [विकल्प]\n"
 "जहाँ सभी [विकल्प] से है\n"
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - यह सहायता संदेश मुद्रित करें\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "   -g [group]     - परिणामों को दिये हुए समूह तक सीमित करना\n"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, c-format
 msgid "                    defaults is %s.\n"
 msgstr "                    %s डिफ़ाल्ट है ।\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "अज्ञात वेबफ़ेच्च `%s' !!!\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "अज्ञात प्रोटोकॉल %s के लिए परिभाषित"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "कोई वेबफ़ेच्च नहीं मिला, समर्थित वेबफ़ेच्च है:  %s\n"
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "प्रोटोकॉल: %s को काबू करने में असमर्थ"
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "प्रतिलिपि असफ़ल: %s"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "डबलू०गेट लुप्त है\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "डबलू०गेट असफ़ल:  %d के साथ या %d संकेत के साथ निर्गम\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "कर्ल लुप्त है\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "कर्ल असफ़ल:  %d के साथ या %d संकेत के साथ निर्गम\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "पुनः एकसारीकरण लुप्त है\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "पुनः एकसारीकरण असफ़ल: %d के साथ या %d संकेत के साथ निर्गम\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "एस०एस०एच० विलुप्त है\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s का %s%% समाप्त, अनुमानित समाप्ति का समय = %s, वेग = %s"
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% समाप्त, वेग = %s"
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...पुनः प्राप्त करने में असफ़लता: %s "
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "संरचना संचिका के वाक्य संख्या %s पर वाक्य-रचना त्रुटि"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 "\"%s\" माध्यम, एक पहिले से उपयोग की जा रही हार्डडिस्क सूची को उपयोग करने की चेष्टा कर "
 "रहा है, माध्यम स्वीकार नहीं है"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 "\"%s\" माध्यम, एक पहिले से उपयोग की जा रही सूची को उपयोग करने की चेष्टा कर रहा है, "
 "माध्यम स्वीकार नहीं है"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -204,40 +143,40 @@ msgstr ""
 "\"%s\" माध्यम को सँभालने में असमर्थ क्योंकि संचिका-सूची पहिले से अन्य माध्यम के द्वारा उपयोग "
 "कीजा रही है "
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 "बेनाम माध्यम के लिए \"%s\" नाम उपयोग करने में असमर्थ क्योंकि यह पहिले से उपयोग किया जा "
 "रहा है"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 "\"%s\" माध्यम को गिनती में लेने में असमर्थ क्योंकि कोई संचिका-सूची [%s] नहीं विद्यमान है"
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "इस हार्डडिस्क संचिका-सूची [%s] के माध्यम का निर्धारण करने असमर्थ"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "\"%s\" की हार्डडिस्क संचिका-सूची को पाने में असमर्थ, माध्यम स्वीकार नहीं है"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "\"%s\" की संचिका-सूची को पाने में असमर्थ, माध्यम स्वीकार नहीं है"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "विद्यमान माध्यम \"%s\" से अलग हट कर निकलने की चेष्टा, बच निकला जा रहा है"
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -246,226 +185,232 @@ msgstr ""
 "काल्पनिक माध्यम \"%s\" को हार्डडिस्क सूची या सूची संचिका को परिभाषित नहीं करना चाहिए,"
 "माध्यम स्वीकार नहीं है"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr ""
 "काल्पनिक माध्यम \"%s\" के पास एक स्पष्ट यू०आर०एल० होना चाहिए, माध्यम स्वीकार नहीं है"
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "\"%s\" के लिए हार्डडिस्क संचिका-सूची को खोजने में असमर्थ, माध्यम स्वीकार नहीं है"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "\"%s\" के लिए संचिका-सूची को खोजने में असमर्थ, माध्यम स्वीकार नहीं है"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "\"%s\" के लिए बेमेल संचिका-सूची, माध्यम स्वीकार नहीं है"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "\"%s\" के लिए संचिका-सूची का निरीक्षण करने में असमर्थ,  माध्यम स्वीकार नहीं है"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "हटाने-योग्य माध्यम \"%s\" के लिए बहुत सारे आरोह बिंदु"
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "हटाने-योग्य साधनों को \"%s\" की भांति लिया जा रहा है"
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "विभिन्न हटाने-योग्य साधनों [%s] का उपयोग \"%s\" के लिए हो रहा है"
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "हटाने-योग्य माध्यम \"%s\" के लिए पथ-नाम को पुनः प्राप्त करने में असमर्थ"
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "संरचना-संचिका [%s] को लिखने में असमर्थ"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "संरचना-संचिका [%s] लिखें"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "use-distrib विधा के साथ सामान्तर विधा का उपयोग नहीं किया जा सकता है"
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "\"%s\" का पदभंजन [%s] संचिका में करने में असमर्थ"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "समान्तर प्रबंधकर्ता का निरीक्षण [%s] संचिका में हो रहा है"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "नोडों: %s के लिए समान्तर प्रबंधकर्ता मिला है"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "समान्तर मोड: %s के लिए संयुक्त माध्यम का उपयोग हो रहा है"
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "समान्तर विकल्प \"%s\" का उपयोग करने में असमर्थ"
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
 "update or --parallel"
 msgstr "--कृत्रिमता का उपयोग --माध्यम, --अपडेट या --समान्तर के साथ नहीं हो सकता है"
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "कृत्रिम संचिका [%s] का निरीक्षण किया जा रहा है"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "हार्डडिस्क-सूची संचिका [%s] का निरीक्षण किया जा रहा है"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "काल्पनिक माध्यम \"%s\" स्थानीय नहीं है, माध्यम स्वीकार नहीं है"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "\"%s\" माध्यम की हार्डडिस्क सूची संचिका या कृत्रिम संचिका को पढ़ने में सामस्या"
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "आधीनताओं की गणना का द्वितीय चरण पूरा किया जा रहा है\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "%s पैकेज को त्यागा जा रहा है"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "%s को उन्नयन करने की बजाय संसाधित किया जायेगा"
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "आर०पी०एम०डी०बी० को खोलने में असमर्थ"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "\"%s\" माध्यम पहिले से विद्यमान है"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr "काल्पनिक माध्यम को स्थानीय होना चाहिए"
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "%s माध्यम को जोड़ा गया"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "प्रथम संसाधन माध्यम को पाने में असमर्थ"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "हार्डडिस्क सूची संचिका की प्रतिलिपि बनाई जा रही है..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "...प्रतिलिपि बनना असफ़ल"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "...प्रतिलिपि बनना सम्पन्न हुआ"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
 "found)"
 msgstr "प्रथम संसाधन माध्यम को पाने में असमर्थ(कोई मैनड्रैक/मूल/हार्डडिस्क संचिका नहीं मिली)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "हार्डडिस्क सूची संचिका को पुनःप्राप्त किया जा रहा है..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "...पुनः प्राप्त करने की क्रिया संपन्न"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...पुनः प्राप्त करने में असफ़लता: %s "
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "हार्डडिस्क सूची संचिका में अवैध हार्डडिस्क सूची विवरण \"%s\""
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "अविद्यमान माध्यम \"%s\" को चयन का प्रयास किया जा रहा है"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "बहुत सारे माध्यमों का चयन हो रहा है: %s"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "\"%s\" माध्यम को हटाया जा रहा है"
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -475,7 +420,7 @@ msgstr ""
 "\"%s\" माध्यम की पहुँच में असमर्थ,\n"
 "यह सम्भव है जब आपने माध्यम का निर्माण करते समय, निर्देशिका कोस्वंम ही आरोहित किया हो।"
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -484,228 +429,228 @@ msgstr ""
 "काल्पनिक माध्यम \"%s\" के पास हार्डडिस्क सूची या कृत्रिमता का वैध स्रोत्र होना "
 "चाहिए।माध्यम स्वीकार नहीं है"
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "\"%s\" संचिका के विवरण की प्रतिलिपि बनायी जा रहीं है..."
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr ""
 "विद्यमान हार्डडिस्क सूची (या कृत्रिम रचनाओं) की प्रतिलिपियों के एम०डी०५सम (md5sum) की "
 "गणना की जा रही है"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "एम०डी०५सम (md5sum) संचिका का निरीक्षण किया जा रहा है"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "\"%s\" की मूल (या कॄत्रिम) हार्डडिस्क सूची की प्रतिलिपि बनाई जा रही है..."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "[%s] की प्रतिलिपि असफ़ल रही (संचिका सन्देहात्मक ढ़ग से छोटी है)"
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr ""
 "स्रोत्र हार्डडिस्क सूची (या कृत्रिम रचनाओं) की प्रतिलिपियों की एम०डी०५सम (md5sum) की "
 "गणना की जा रही है"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "[%s] की प्रतिलिपि अयोग्य है (एमडी५सम बेमेल है)"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "\"%s\" माध्यम की कृत्रिम संचिका को पढ़ने में समस्या"
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "[%s] से आर०पी०एम० संचिकाओं को पढ़ा जा रहा है"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "आर०पी०एम० संचिकाओं को [%s] से पढ़ने में असमर्थ: %s"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "[%s] कि लिए कोई आर०पी०एम० संचिकाऐं नहीं मिली"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "\"%s\" की मूल (या कृत्रिम) हार्डडिस्क सूची पुनः प्राप्त की जा रही है..."
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "खोजी हुई हार्डडिस्क सूची (या कृत्रिम रचना)%s के रूप में मिली"
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr ""
 "पुनः प्राप्त की हुई स्रोत्र हार्डडिस्क सूची (या कृत्रिम रचना) के एम०डी०५सम (md5sum) की "
 "गणना की जा रही है"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr "एम०डी०५सम (md5sum) बेमेल"
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "स्रोत्र हार्डडिस्क सूची (या कृत्रिम रचना) का पुनः प्राप्त करना असफ़ल"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "\"%s\" माध्यम के लिए कोई हार्डडिस्क सूची संचिका नहीं मिली"
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "[%s] संचिका \"%s\" समान माध्यम में पहिले से उपयोग में है"
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "\"%s\" की हार्डडिस्क संचिका का पदभंजन करने में असमर्थ"
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "\"%s\" की सूची संचिका को लिखने में असमर्थ"
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "\"%s\" माध्यम के लिए संचिका-सूची लिखी जा रही है"
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "\"%s\" के लिए संचिका-सूची में कुछ भी नहीं लिखा है"
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "\"%s\" की सामान्यजन कूंजी संचिका का निरीक्षण किया जा रहा है..."
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...\"%s\" की पब्लिककुंजी संचिका से %s कुंजी आयातित कर ली गई है"
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "\"%s\" की सामान्यजनकुंजी संचिका को आयात करने में असमर्थ"
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "\"%s\" माध्यम से शीर्षक पढ़े जा रहे है"
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "हार्डडिस्क-सूची [%s] का निर्माण किया जा रहा है"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "\"%s\" माध्यम के लिए हार्डडिस्क-सूची की कृत्रिम संचिका बनायें"
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "कैच में %d शीर्षक मिलें"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "कैच में स्थित %d अप्रचलित शीर्षकों को हटाया जा रहा है"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "%s को आरोह (माउन्ट) किया जा रहा है"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "%s को अवरोह (अनमाउन्ट) किया जा रहा है"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "डेप्स-सूची में %s प्रविष्टियां पुनः स्थापित  की गई"
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "डेप्स-सूची में कोई प्रविष्टियां पुनः स्थापित नहीं है"
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "अवैध आर०पी०एम० संचिका नाम [%s]"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "आर०पी०एम० संचिका [%s] को पुनः प्राप्त किया जा रहा है..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "आर०पी०एम० संचिका [%s] को पाने में असमर्थ"
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "आर०पी०एम० संचिका का पंजीकरण में असमर्थ"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "स्थानीय पैकेजों का पंजीकरण करने में त्रुटि"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "%s नाम का कोई पैकेज नहीं है"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "निम्नलिखित पैकेज %s को समाहित करते है:  %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "यहाँ बहुत सारे पैकेज \"%s\" संचिका के समान नाम वाले है"
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "भली-भांति से [%s] का पदभंजन \"%s\" मान पर करने में असमर्थ"
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -715,62 +660,62 @@ msgstr ""
 "दर्पण-स्थल (समरूप प्रणाली) लगता है कि अप-टु-डेट नहीं है। अन्य तरीके को उपयोग करने की "
 "चेष्टा करें"
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "\"%s\" माध्यम, आर०पी०एम० संचिकाओं के लिए किसी स्थान को परिभाषित नहीं करता है"
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "%s पैकेज नहीं मिला"
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "यू०आर०पी०एम०आई० डाटाबेस बंद है"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "माध्यम \"%s\" का चयन नहीं किया गया है"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "\"%s\" माध्यम से आर०पी०एम० संचिका [%s] को पढ़ने में असमर्थ"
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "बेमेल माध्यम \"%s\" को हटानेयोग्य चिह्नित किया गया है परन्तु वास्तव में ऐसा नहीं है"
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "\"%s\" माध्यम को पाने में असमर्थ"
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "भ्रष्ट इन्पुट:  [%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "\"%s\" माध्यम से आर०पी०एम० संचिकाऐं पुनः प्राप्त की जा रही है..."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "तैयारी की जा रही है..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "%d पद्धति का उपयोग कार्य संपादन के लिए हो रहा है"
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -778,82 +723,97 @@ msgstr ""
 "%s पर संसाधन करने के लिए कार्य-संपादन का निर्माण किया गया (हटाना=%d, संसाधन=%d, "
 "उन्नयन=%d)"
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr "कार्य संपादन का निर्माण करने में असमर्थ"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "%s पैकेज को हटाया जा रहा है"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "%s पैकेज को ह्टाने में असमर्थ"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "%s पैकेज को जोड़ा जा रहा है (आई०डी०=%d, ई०आई०डी०=%d, उन्नयन=%d, संचिका=%s)"
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "%s पैकेज को संसाधन करने में असमर्थ"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "%s के ना मिलने के कारण"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "असन्तुष्ट %s के कारण"
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr "%s को प्रोत्साहित करने का प्रयास किया जा रहा है"
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr "%s को रखने के लिए"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "%s को संसाधित के लिए"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "%s के साथ विरोधाभास के कारण"
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr "बिना निवेदन किया हुआ"
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "अवैध हस्ताक्षर (%s)"
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "अवैध कुंजी आई०डी० (%s)"
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "विलुप्त हस्ताक्षर (%s)"
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "निर्देश वाक्य पर निकृष्ट प्रोक्सी की घोषणा\n"
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: आर०पी०एम० संचिका \"%s\" को नहीं पढ़ सकता है\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "क्षमा करें, खराब पसन्द, पुनः प्रयास करें\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -870,24 +830,24 @@ msgstr ""
 "\n"
 "उपयोग विधि:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - यह सहायता संदेश मुद्रित करें\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - इच्छित पैकेजों में से एक पैकेज स्वतः चयन\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr "  --test         - जाँच करें कि संसाधन सफ़लता-पूर्वक किया जा सकता है\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
@@ -895,18 +855,18 @@ msgstr ""
 "  --force        - यद्यपि कुछ पैकेज ना विद्यमान हो, तो भी इनवोकेशन को बल-पूर्वक लागू "
 "करें \n"
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 "  --parallel     - वितरित यू०आर०पी०एम०आई०, उपनाम वाली प्रणालीयों के बीच में\n"
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - आरपीएम संसाधन के लिए अन्य रूट का उपयोग\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -916,74 +876,64 @@ msgstr ""
 "                   एक सीएचरूट को --root विकल्प के साथ संसाधित (असंसाधित) करने में "
 "उपयोगी।\n"
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - शब्दों का वॄथा प्रयोगिक विधि\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - मिलती हुई अभिव्यक्तियों वाले सभी पैकेजों का चयन करें\n"
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: अज्ञात विकल्प \"-%s\", उपयोग विधि के बारे में --help से जानें\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr "पैकेजों का प्रकार अज्ञात"
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "अज्ञात पैकेज"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "%s पैकेज को हटाने से आपकी प्रणाली नष्ट हो जायेगी"
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr "हटाने को कुछ भी नहीं"
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "निम्नलिखित पैकेजों को हटाने जाने के लिए जाँच हो रही है"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
 "अधिनताओं को सन्तुष्ट करने के लिए, निम्नलिखित पैकेजों को संसाधित किया जाने वाला है (%d "
 "एम०बी०)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr "(हाँ/ना:y/N)"
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "%s को हटाया जा रहा है"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr "हटाना असफ़ल"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "क्षमा करें, खराब पसन्द, पुनः प्रयास करें\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -998,26 +948,26 @@ msgstr ""
 "\n"
 "उपयोग विधि:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - सिर्फ़ अपडेट माध्यम का ही उपयोग करें\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 "  --media        - सिर्फ़ दिए गए माध्यम का उपयोग करें, छोटे विराम चिह्न के द्वारा अलग "
 "किये हुए\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 "  --excludemedia - दिये हुए मीडीया का उपयोग ना करें, छोटे विराम चिह्न के द्वारा अलग "
 "किये हुए\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1025,17 +975,17 @@ msgstr ""
 "  --sortmedia    - मीडीया को कॉमा के द्वारा अलग की हुई सहायक-कड़ियों के अनुसार क्रम "
 "में लगाना\n"
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr "  --synthesis    - कृत्रिमता का उपयोग यू०आर०पी०एम०आई०-डी०बी० के बजाय\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - शब्दों का वॄथा प्रयोगिक विधि\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1046,87 +996,87 @@ msgstr ""
 "साथ  ना दिया हो,\n"
 "                   परस्पर संपर्क (इन्टर-ऐक्टिव) मोड के साथ अयोग्य)\n"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --uniq         - एक जैसे वाक्यों को मुद्रित ना करें\n"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all          - सभी टैगों को मुद्रित करें\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group        - टैग समूह को मुद्रित करें: समूह\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size         - टैग आकार को मुद्रित करें: आकार\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --epoch        - टैग इपॉच्च को मुद्रित करें: इपॉच्च\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary      - टैग सारांश को मुद्रित करें: सारांश\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description  - टैग विवरण मुद्रित करें: विवरण\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr "  --sourcerpm    - टैग स्रोत्र आर०पी०एम० को मुद्रित करें: स्रोत्र आर०पी०एम०\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr "  --packager     - टैग पैकेजर को मुद्रित करना: पैकेजर\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr "  --buildhost    - टैग होस्ट निर्माणकर्ता को मुद्रित करना: होस्ट निर्माणकर्ता\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --url          - टैग यू०आर०एल० को मुद्रित करें:यू०आर०एल०\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr "  --provides     -  टैग की उपलब्धियां मुद्रित करें: सभी उपलब्धियां\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr "  --requires     - टैग की आवश्यकताऐं मुद्रित करें: सभी आवश्यकताऐं (बहु-वाक्य)\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files        - टैग की संचिकाऐं मुद्रित करें: सभी संचिकाऐं \n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr "  --conflicts    - टैग के विरोधाभासों को मुद्रित करें: सभी विरोधाभास\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr "  --obsoletes    - टैग के अप्रचलितों को मुद्रित करें: सभी लुप्तप्रयोग\n"
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
@@ -1135,22 +1085,22 @@ msgstr ""
 "  --env          - विशिष्ट वातावरण का उपयोग (आदर्श रूप में एक दोष\n"
 "                   रिपोर्ट)\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr "  -i             - सभी प्रतिरूपों में छोटे-बड़े शब्दों का ध्यान ना रखें\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - \tमुद्रित संस्मरण, विमोचन और आर्च नाम के साथ\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - पर्ल कोड को perl -e जैसे सीधे सम्मलित\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
@@ -1158,7 +1108,7 @@ msgstr ""
 "  -a             - द्विआधारी \"और\" प्रवर्तक (ऑपरेटर), सत्य यदि दोनों अभिव्यक्तियां "
 "सत्य है\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
@@ -1166,22 +1116,22 @@ msgstr ""
 "  -o             - द्विआधारी \"या\" प्रवर्तक (ऑपरेटर), सत्य यदि एक अभिव्यक्ति सत्य "
 "है\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - एकल \"नहीं\", सत्य यदि अभिव्यक्ति असत्य है\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr "  (              - बाँया कोष्टक का चिह्न समूह अभिव्यक्ति का खोलने के लिए\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr "  )              - दाहिना कोष्टक का चिह्न समूह अभिव्यक्ति का बंद करने के लिए\n"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
@@ -1190,12 +1140,12 @@ msgstr ""
 "यथास्थिति करने का निर्देश (कॉलबैक) %s\n"
 "है\n"
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "%s पर विशिष्ट वातावरण का उपयोग करते हुए\n"
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1211,19 +1161,19 @@ msgstr ""
 "\n"
 "उपयोग विधि:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - यू०आर०पी०एन०आई० डी०बी० के बजाय, दी हुई कृत्रिमता का उपयोग करें\n"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - प्रणाली को उन्नयन बनाने के लिए, स्वतः पैकेजों का चयन करें\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
@@ -1231,7 +1181,7 @@ msgid ""
 msgstr ""
 "  --no-uninstall - एक पैकेज को असंसाधित करने के लिए कभी ना पूछेना,संसाधन को रोकना\n"
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1241,7 +1191,7 @@ msgstr ""
 "अस्वीकार करें,\n"
 "                   जिनके कारण से हटाना पड़ रहा है।\n"
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1252,37 +1202,37 @@ msgstr ""
 "को संसाधित या उन्नयत किया जाना है,\n"
 "                   सामान्य संख्या %d है।\n"
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - लघु क्रिया-कलाप लंबाई, सामान्य संख्या %d है।\n"
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - अस्पष्ट खोज को लागू करें (-y जैसा)\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - अगला पैकेज एक स्रोत्र पैकेज है (-s जैसा)\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - सिर्फ़ स्रोत्र पैकेज को संसाधित करें (कोई बॉयनरी नहीं)\n"
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - कुछ भी करने कि पहिले आर०पी०एम० को कैच से हटायें\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - ना उपयोग में आने वाले आर०पी०एम० को कैच में रक्खें\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1291,7 +1241,7 @@ msgstr ""
 "  --allow-nodeps - उपयोगकर्ता को, पैकेजों को बिना अधिनताओं की जाँच करें,\n"
 "                   संसाधित करने के लिए प्रश्न पूछने की अनुमति प्रदान करें\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1300,7 +1250,7 @@ msgstr ""
 "  --allow-force  - उपयोगकर्ता को, पैकेजों को बिना अधिनताओं और अखंडता की जाँच करें,\n"
 "                   संसाधित करने के लिए प्रश्न पूछने की अनुमति प्रदान करें\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1310,23 +1260,23 @@ msgstr ""
 "                   एक सीएचरूट को --root विकल्प के साथ संसाधित (असंसाधित) करने में "
 "उपयोगी।\n"
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 "  --wget         - डबलू०गेट का उपयोग दूर स्थित संचिकाओं को प्राप्त करने के लिए करें\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - कर्ल का उपयोग दूर स्थित संचिकाओं को प्राप्त करने के लिए करें\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - डॉउनलोड के वेग को सीमित करें\n"
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1335,7 +1285,7 @@ msgstr ""
 "  --resume   - अधूरी-डॉउनलोड-की-हुई संचिकाओं के स्थानान्तरण का पुनः आरम्भ\n"
 "                   (--no-resume इसे असक्रिय करता है, डिफ़ॉल्ट असक्रिय है)।\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1345,7 +1295,7 @@ msgstr ""
 "डिफ़ॉल्ट कल्पना १०८० के रूप में\n"
 "                   कर ली गई है (निर्देश देने का तरीका <प्रोक्सी होस्ट[:पोर्ट]>).\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1354,7 +1304,7 @@ msgstr ""
 "  --proxy-user   - प्रोक्सी प्रमाणीकरण के लिए उपयोगकर्ता और कूटशब्द बतायें\n"
 "                    (निर्देश देने का तरीका <उपयोगकर्ता:कूटशब्द>).\n"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1363,12 +1313,12 @@ msgstr ""
 "  --bug          - एक दोष रिपोर्ट को अगले मान के द्वारा बताई गयी निर्देशिका में\n"
 "                   निर्गम करें\n"
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - एक्स (X) इन्टरफ़ेस का उपयोग करें\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1377,7 +1327,7 @@ msgstr ""
 "  --best-output  - वातावरण के अनुसार, श्रेष्ठ इन्टरफ़ेस का चयन करें:\n"
 "                   एक्स (X) या गद्य (text) विधि\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1386,78 +1336,65 @@ msgstr ""
 "  --verify-rpm   - संसाधन के पहिले, आर०पी०एम० हस्ताक्षर की जाँच करें\n"
 "                   (--no-verify-rpm इसे अयोग्य करता है, डिफ़ॉल्ट जाँच के साथ है).\n"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - पथ को अलग करें, छोटे विराम चिह्न के द्वारा अलग किये हुए\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - प्रलेखन संचिकाओं को अलग करके।\n"
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - निर्देश वाक्य पर सभी मिलानों को चयन करें\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 "  -p             - पूर्वनिर्दिष्टों में पैकेज को पाने के लिए खोज की अनुमति प्रदान करें\n"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - पूर्वनिर्दिष्टों में पैकेज को पाने के लिए ना खोजे\n"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - अस्पष्ट खोज को लागू करें (--fuzzy जैसा)\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s             - अगला पैकेज एक स्रोत्र पैकेज है (--src जैसा)\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - शांत विधि\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "निर्देश वाक्य पर दिये हुए नाम या आर०पी०एम० संचिकाऐं संसाधित की जायेगी\n"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr "संचिका को सुरक्षित करने के स्थान का चयन करें"
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "निर्देश वाक्य पर निकृष्ट प्रोक्सी की घोषणा\n"
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-"यू०आर०पी०एम०आई०: अज्ञात विकल्प \"-%s\", --help के साथ निर्देश देकर उपयोगविधि की जाँच "
-"करें\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 "द्विआधारी आर०पी०एम० संचिकाओं के साथ क्या किया जा सकता है, जब  --install-src निर्देश "
 "का उपयोग किया जा रहा हो"
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1478,22 +1415,22 @@ msgstr ""
 "\n"
 "आप क्या करना चाहते है?"
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "कुछ नहीं करो"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr "हाँ, वास्तव इसे संसाधित करें"
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr "संचिका को सुरक्षित करें"
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1508,12 +1445,12 @@ msgstr ""
 "\n"
 "आप हो सकता है कि इसे सिर्फ़ सुरक्षित करना चाहते है । आपकी पसन्द क्या है?"
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, c-format
 msgid "Install it"
 msgstr "इसे संसाधित करें"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1522,42 +1459,42 @@ msgstr ""
 "[%s] निर्देशिका पहिले से विद्यमान है, कृपया दोष रिपोर्ट के लिए अन्य निर्देशिका का उपयोग "
 "करेंया इसे हटा दें ।"
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "दोष रिपोर्ट के लिए, [%s] निर्देशिका का निर्माण करने में असमर्थ"
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "सिर्फ़ महाउपयोगकर्ता को ही पैकेजों को संसाधित करने की अनुमति है"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "%s को संसाधित करने के लिए, निम्नलिखित पैकेजों में से एक की आवश्यकता है: "
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "निम्नलिखित पैकेजों में से एक की आवश्यकता है:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "आपकी क्या इच्छा है?  (1-%d) "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "पैकेज संसाधित हो रहा है..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "प्रारंभिकीकरण..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1566,12 +1503,12 @@ msgstr ""
 "निवेदन किये हुए कुछ पैकेज संसाधित नहीं किये जा सके:\n"
 "%s"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr "क्या आप सहमत है ?"
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1582,7 +1519,7 @@ msgstr ""
 "निम्नलिखित पैकेजों को हटाना पड़ेगा:\n"
 "%s\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1591,14 +1528,14 @@ msgstr ""
 "अन्य पैकजों को उन्नयन करने के लिए, निम्नलिखित पैकेजों हटाना होगा:\n"
 "%s"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr "आधीनताओं को सन्तुष्ट करने के लिए, निम्नलिखित पैकेज हटाने जाने वाले है (%d एम०बी०)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1607,37 +1544,47 @@ msgstr ""
 "निम्नलिखित आधिनताओं को संसाधित करने लिए, आपको महाउपयोगकर्ता होना चाहिए:\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "स्रोत्र पैकेजों को पाने में असमर्थ, कार्यक्रम विफ़ल किया जा रहा है"
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "कृपया \"%s\" नामक माध्यम को [%s] साधन पर प्रवेश करें"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "तैयार होने पर इन्टर (Enter) कुंजी को दबायें..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "`%s' पैकेज को डॉउनलोड किया जा रहा है..."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s का %s%% समाप्त, अनुमानित समाप्ति का समय = %s, वेग = %s"
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% समाप्त, वेग = %s"
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "निम्नलिखित पैकेजों पर खराब हस्ताक्षार है"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "क्या आप संसाधन जारी रखना चाहते है ?"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1648,57 +1595,57 @@ msgstr ""
 "%s\n"
 "आपको अपना यू०आर०पी०एम०आई० डाटाबेस को अपडेट करना चाहिए"
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "संसाधन असफ़ल"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr "%s वितिरण किया जा रहा है"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr "%s का संसाधन किया जा रहा है"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "`%s' (%s/%s) पैकेज को संसाधित किया जा रहा है..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "संसाधन का प्रयास बिना आधिनताओं की जाँच किये हुए किया जाये?  (हाँ/ना)(y/N) "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "संसाधन का प्रयास और जोर से (बलपूर्वक) किया जाये (--force)?  (हाँ/ना)(y/N) "
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d संसाधन क्रिया-कलाप असफ़ल"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "संसाधन संभव है"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "सभी कुछ पहिले से ही संसाधित है"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr "यू०आर०पी०एम०आई० को पुनः आरम्भ किया जा रहा है"
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1723,22 +1670,22 @@ msgstr ""
 "\n"
 "और [विकल्प] से है\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - एक अपडेट माध्यम का निर्माण करें\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr "  --probe-synthesis - कृत्रिम संचिका को खोजने और उपयोग करने के प्रयास\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr "  --probe-hdlist - हार्डडिस्क सूची संचिका को खोजना और उपयोग करना\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
@@ -1747,7 +1694,7 @@ msgstr ""
 "  --no-probe     - किसी कृत्रिम या हार्डडिस्क सूची संचिका को खोजने का \n"
 "                   प्रयास ना करें\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -1756,7 +1703,7 @@ msgstr ""
 "  --distrib      - एक संसाधन माध्यम से सभी मीडीया का स्वतः \n"
 "                   निर्माण करें\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1768,7 +1715,7 @@ msgstr ""
 "                    एक्स एक्स एक्स, मुख्य, अंशदान, अपडेट या\n"
 "                   कुछ भी और जिसे संरचित किया जा चुका है, होना चाहिए ;-)\n"
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1778,7 +1725,7 @@ msgstr ""
 "करें, डिफ़ॉल्ट\n"
 "                   %s है\n"
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1789,7 +1736,7 @@ msgstr ""
 "                   मैनड्रैक विमोचित पैकेज के द्वारा बताये गये वितरण के संस्मरण\n"
 "                   जैसा ले लिया गया है\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
@@ -1799,7 +1746,7 @@ msgstr ""
 "पैकेजों को \n"
 "                   संसाधित कर दिया गया है\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
@@ -1808,73 +1755,52 @@ msgstr ""
 "  --virtual      - काल्पनिक माध्यम का निर्माण करना जो हमेशा अप-टु-डेट रहें,\n"
 "                   सिर्फ़  file:// प्रोटोकॉल की अनूमति है।\n"
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - एम०डी०-५ सम संचिका की जाँच निष्क्रिय ।\n"
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - शीर्ष कैच निर्देशिका को स्वच्छ करें\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - हार्डडिस्क सूची संचिकाओं का बल-पूर्वक निर्माण\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"अज्ञात विकल्प '%s'\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "एक कुकर वितरण के उन्नयनों (अपडेट्स) को जोड़ा नहीं जा सकता है\n"
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "समरूप प्रणालियों को %s पर पुनः प्राप्त किया जा रहा है ..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"<हार्डडिस्क सूची का सापेक्ष पथ>  --distrib के साथ देने की कोई आवश्यकता नहीं है"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "<हार्डडिस्क सूची का सापेक्ष पथ>  --distrib के साथ देने की कोई आवश्यकता नहीं है"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "\"%s\" माध्यम को अपडेट करने में असमर्थ\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"<हार्डडिस्क सूची का सापेक्ष पथ> लुप्त है\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<हार्डडिस्क सूची का सापेक्ष पथ> लुप्त है\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"नेटवर्क माध्यम `के साथ' विलुप्त\n"
+msgid "`with' missing for network media\n"
+msgstr "नेटवर्क माध्यम `के साथ' विलुप्त\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "\"%s\" माध्यम का निर्माण करने में असमर्थ\n"
@@ -1893,6 +1819,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - सभी माध्यमों का चयन करें\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"अज्ञात विकल्प '%s'\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1908,7 +1843,7 @@ msgstr ""
 "हटायी जाने वाली प्रविष्टि लुप्त है\n"
 "(%s में से एक)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1917,29 +1852,29 @@ msgstr ""
 "उपयोग विधि: urpmi.update [विकल्प] <नाम> ...\n"
 "जहाँ <नाम> एक माध्यम का नाम है जिसे अपडेट करना है\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - सिर्फ़ अपडेट माध्यम को अपडेट करें\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr "  --force-key    - जीपीजी कुँजी का बलपूर्वक उन्नयन ।\n"
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - सभी स्थिर माध्यमों का चयन करें\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "अपडेट करने को कुछ भी नहीं (urpmi.addmedia निर्देश का उपयोग एक माध्यम को जोड़ने के लिए "
 "करें)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1948,7 +1883,7 @@ msgstr ""
 "अपडेट की जाने वाली प्रविष्टि लुप्त है\n"
 "(%s में से एक)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1964,22 +1899,22 @@ msgstr ""
 "\n"
 "उपयोग विधि:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - उपलब्ध पैकेजों को दिखायें\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - उपलब्ध माध्यमों को दिखायें\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url   - उपलब्ध माध्यमों और उनके यूआरएल को दिखायें\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
@@ -1987,19 +1922,19 @@ msgstr ""
 "  --dump-config  - यूआरपीएमआई.एडमीडीया.आर्गूमेन्ट (urpmi.addmedia argument) के "
 "प्रारुप में संरचना को डम्प करना।\n"
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 "  --list-nodes   - उपलब्ध नोडस को दिखायें, जब --parallel विकल्प का उपयोग किया जा "
 "रहा हो\n"
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - उपलब्ध समान्तर नामों को दिखायें\n"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
@@ -2009,14 +1944,14 @@ msgstr ""
 "एसटीडीआउट पर निकालें\n"
 "                    (सिर्फ़ महाउपयोगकर्ता)\n"
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 "  --sources      - सभी स्रोत्र पैकेजों को डॉउनलोड के पहिले दें (सिर्फ़ महाउपयोगकर्ता)\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
@@ -2025,69 +1960,124 @@ msgstr ""
 "  --use-distrib  - एक वितरित वृक्ष के लिए यूआरपीएमआई की देखते-देखते संरचना।\n"
 "                   यह एक वितरण की पूछ-ताछ करने की अनुमति देता है।\n"
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  -changelog      - परिवर्तन लॉग का मुद्रण\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - जाँच को पैकेज की अधिनताओं तक ले जायें\n"
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr "-u             - पैकेज को हटायें यदि एक अत्यधिक नवीन संस्मरण पहिले सेसंसाधित है\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - सम्पूर्ण आउटपुट को पैकेज के साथ हटायें\n"
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - पैकेजों की जो आवश्यक है उससे विपरीत खोज करें\n"
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -i             - उपयोगी सूचनाओं का पठनीय रूप में मुद्रण\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - समूहों को नाम के साथ मुद्रित करें\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - संस्मरण और विमोचन संख्या को नाम के साथ मुद्रित करें\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  --l         - पैकेज में स्थित संचिकाओं की सूची।\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  निर्देश वाक्य पर दिये हुए नामों या आर०पी०एम० संचिकाओं की जाँच की गई है\n"
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: अज्ञात विकल्प \"-%s\", उपयोग विधि  --help के साथ जाँच करें\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: आर०पी०एम० संचिका \"%s\" को नहीं पढ़ सकता है\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes को सिर्फ़ --parallel के साथ उपयोग किया जा सकता है"
+
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "अज्ञात वेबफ़ेच्च `%s' !!!\n"
+
+#~ msgid "copy failed: %s"
+#~ msgstr "प्रतिलिपि असफ़ल: %s"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "डबलू०गेट लुप्त है\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "डबलू०गेट असफ़ल:  %d के साथ या %d संकेत के साथ निर्गम\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "कर्ल लुप्त है\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "कर्ल असफ़ल:  %d के साथ या %d संकेत के साथ निर्गम\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "पुनः एकसारीकरण लुप्त है\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "पुनः एकसारीकरण असफ़ल: %d के साथ या %d संकेत के साथ निर्गम\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "एस०एस०एच० विलुप्त है\n"
+
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpme: अज्ञात विकल्प \"-%s\", उपयोग विधि के बारे में --help से जानें\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "यू०आर०पी०एम०आई०: अज्ञात विकल्प \"-%s\", --help के साथ निर्देश देकर उपयोगविधि की "
+#~ "जाँच करें\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr ""
+#~ "आधीनताओं को सन्तुष्ट करने के लिए, निम्नलिखित पैकेज हटाने जाने वाले है (%d एम०बी०)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "<हार्डडिस्क सूची का सापेक्ष पथ>  --distrib के साथ देने की कोई आवश्यकता नहीं है"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "<हार्डडिस्क सूची का सापेक्ष पथ> लुप्त है\n"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "नेटवर्क माध्यम `के साथ' विलुप्त\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmq: अज्ञात विकल्प \"-%s\", उपयोग विधि  --help के साथ जाँच करें\n"
diff --git a/po/hr.po b/po/hr.po
index 4648deba..c7d64da4 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2002-03-08 13:56CET\n"
 "Last-Translator: Vlatko Kosturjak <kost@iname.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -50,22 +50,22 @@ msgstr ""
 "Automatska instalacija paketa...\n"
 "Zatražili ste instalaciju paketa %s\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "Da li se slažete s tim?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "U redu"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Odustani"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (D/n) "
@@ -75,120 +75,59 @@ msgstr " (D/n) "
 msgid "%s: command not found\n"
 msgstr "%s: komanda nije pronađena\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "where [options] are from\n"
 msgstr ""
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - ispiši ovaj tekst s pomoći.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, fuzzy, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "  --group         -ispisuje oznaku group: grupu."
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, fuzzy, c-format
 msgid "                    defaults is %s.\n"
 msgstr "  --all           - ispiši sve oznake."
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr ""
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr ""
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, fuzzy, c-format
 msgid "unable to handle protocol: %s"
 msgstr "ne mogu napraviti hdlist: %s"
 
-#: ../urpm.pm:189
-#, fuzzy, c-format
-msgid "copy failed: %s"
-msgstr "...kopiranje neuspješno"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "wget nedostaje\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget neuspješan: izašao je sa %d ili signalom %d\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "curl nedostaje\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl neuspješan: izašao je sa %d ili sa signalom %d\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, fuzzy, c-format
-msgid "rsync is missing\n"
-msgstr "curl nedostaje\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, fuzzy, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "curl neuspješan: izašao je sa %d ili sa signalom %d\n"
-
-#: ../urpm.pm:396
-#, fuzzy, c-format
-msgid "ssh is missing\n"
-msgstr "wget nedostaje\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr ""
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr ""
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...dohvaćanje neuspješno: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "greška u sintaksi u config datoteci na liniji %s"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, fuzzy, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr "medij \"%s\" pokušava koristiti već korišteni hdlist, medij ignoriran"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, fuzzy, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr "medij \"%s\" pokušava koristiti već korišteni popis, medij ignoriran"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -197,220 +136,220 @@ msgstr ""
 "ne mogu se pobriniti za medij \"%s\" pošto se list datoteka već koristi za "
 "drugi medij"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 "ne mogu koristiti \"%s\" za bezimeni medij zato što se to ime već koristi"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr "ne mogu uzeti medij \"%s\" u račun pošto list datoteka [%s] ne postoji"
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "ne mogu odrediti medij od navedene hdlist datoteke [%s]"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "ne mogu pristupiti hdlist datoteci od \"%s\", medij ignoriran"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "ne mogu pristupiti list datoteci od \"%s\", medij ignoriran"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "pokušavam zaobiči postojeći medij \"%s\", izbjegavam"
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, fuzzy, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
 "ignored"
 msgstr "medij \"%s\" pokušava koristiti već korišteni hdlist, medij ignoriran"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, fuzzy, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "medij \"%s\" pokušava koristiti već korišteni popis, medij ignoriran"
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "ne mogu pronaći hdlist datoteku za \"%s\", medij ignoriran"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "ne mogu pronaći list datoteku za \"%s\", medij ignoriran"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "nepotpuna list datoteka za \"%s\", medij ignoriran"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "ne mogu provjeriti list datoteku za \"%s\", medij ignoriran"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "previše točaka montiranja za prenosivi medij \"%s\""
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "uzimam prenosivi uređaj kao \"%s\""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "koristim različite prenosive uređaje [%s] za \"%s\""
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "ne mogu dohvatiti putanju za prenosivi medij \"%s\""
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "ne mogu zapisati config datoteku [%s]"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "zapisana config datoteka [%s]"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, fuzzy, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "ne mogu pristupiti rpm datoteci [%s]"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, fuzzy, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "ispitujem hdlist datoteku [%s]"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, fuzzy, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "pronašao sam ispitani hdlist (ili synthesis) kao %s"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr ""
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, fuzzy, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "ne mogu ažurirati medij \"%s\"\n"
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, fuzzy, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
 "update or --parallel"
 msgstr "  --all           - ispiši sve oznake."
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "ispitujem synthesis datoteku [%s]"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "ispitujem hdlist datoteku [%s]"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, fuzzy, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "medij \"%s\" pokušava koristiti već korišteni popis, medij ignoriran"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, fuzzy, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "napravljen hdlist sintezna datoteka za medij \"%s\""
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr ""
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, fuzzy, c-format
 msgid "skipping package %s"
 msgstr "ne postoji paket pod nazivom %s"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, fuzzy, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "Samo je administratoru dozvoljeno da instalira pakete"
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, fuzzy, c-format
 msgid "unable to open rpmdb"
 msgstr "ne mogu registrirati rpm datoteku"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "medij \"%s\" već postoji"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr ""
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "dodan medij %s"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "ne mogu pristupiti prvom instalacijskom mediju"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "kopiram hdlists datoteku..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, fuzzy, c-format
 msgid "...copying failed"
 msgstr "...kopiranje završeno"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "...kopiranje završeno"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
@@ -419,43 +358,49 @@ msgstr ""
 "ne mogu pristupiti prvom instalacijskom mediju (nije pronađen Mandrake/base/"
 "hdlists)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "dohvaćam hdlists datoteku..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "...dohvat završen"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...dohvaćanje neuspješno: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "nepravilni hdlist opis \"%s\" u hdlists datoteci"
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, fuzzy, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "pokušavam izabrati nepostojeći medij \"%s\""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, fuzzy, c-format
 msgid "selecting multiple media: %s"
 msgstr "pokušavam izabrati višestruki medij: %s"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "uklanjam medij \"%s\""
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -463,372 +408,387 @@ msgid ""
 "medium."
 msgstr ""
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, fuzzy, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
 "ignored"
 msgstr "medij \"%s\" pokušava koristiti već korišteni hdlist, medij ignoriran"
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "kopiranje opisne datoteke od \"%s\"..."
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, fuzzy, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "kopiram hdlist (ili synthesis) izvor od \"%s\"..."
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, fuzzy, c-format
 msgid "examining MD5SUM file"
 msgstr "ispitujem hdlist datoteku [%s]"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "kopiram hdlist (ili synthesis) izvor od \"%s\"..."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, fuzzy, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "kopiram hdlist (ili synthesis) izvor od \"%s\"..."
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, fuzzy, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "kopiranje [%s] neuspješno"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, fuzzy, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "napravljen hdlist sintezna datoteka za medij \"%s\""
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, fuzzy, c-format
 msgid "reading rpm files from [%s]"
 msgstr "nisu pronađene rpm datoteke u [%s]"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, fuzzy, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "ne mogu pročitati rpm datoteku [%s] sa medija \"%s\""
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "nisu pronađene rpm datoteke u [%s]"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "dohvaćam hdlist (ili synthesis) izvor od \"%s\"..."
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, fuzzy, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "kopiram hdlist (ili synthesis) izvor od \"%s\"..."
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "dohvaćanje hdlist (ili synthesis) izvora neuspješno"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr ""
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "dohvaćanje hdlist (ili synthesis) izvora neuspješno"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "nije pronađena hdlist datoteka za medij \"%s\""
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "ne mogu obraditi hdlist datoteku od \"%s\""
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "ne mogu zapisati list datoteku za \"%s\""
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, fuzzy, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "nije pronađena hdlist datoteka za medij \"%s\""
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "nema ništa za zapisati u list datoteku za \"%s\""
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, fuzzy, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "dohvaćam opis datoteka od \"%s\"..."
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, fuzzy, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "ne mogu zapisati list datoteku za \"%s\""
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, fuzzy, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "ne mogu zapisati list datoteku za \"%s\""
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, fuzzy, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "uklanjam medij \"%s\""
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "izgrađujem hdlist [%s]"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "napravljen hdlist sintezna datoteka za medij \"%s\""
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "pronađeno %d zaglavlja u priručnoj memoriji"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "uklanjam %d zastarjelih zaglavlja u priručnoj memoriji"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "montiram %s"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "odmontiravam %s"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "premješteno %s unosa u depslist-u"
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "nema unosa premještenih u depslist"
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "nepravilno ime rpm datoteke [%s]"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, fuzzy, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "dohvaćam rpms datoteku..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "ne mogu pristupiti rpm datoteci [%s]"
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, fuzzy, c-format
 msgid "unable to register rpm file"
 msgstr "ne mogu pristupiti rpm datoteci [%s]"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "greška prilikom registriranja lokalnih paketa"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "ne postoji paket pod nazivom %s"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Slijedeći paketi sadrže %s: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "postoji više paketa sa istim rpm imenom datoteke \"%s\""
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, fuzzy, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "ne mogu obraditi ispravno [%s] na vrijednosti \"%s\""
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
 "  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr ""
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "paket %s nije pronađen."
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi baza zaključana"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "medij \"%s\" nije izabran"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "ne mogu pročitati rpm datoteku [%s] sa medija \"%s\""
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "nepotpun medij \"%s\" označen kao prenosiv ali nije zapravo"
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "ne mogu pristupiti mediju \"%s\""
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "nepravilan unos: [%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, fuzzy, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "dohvaćam rpms datoteku..."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr ""
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr ""
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, fuzzy, c-format
 msgid "unable to create transaction"
 msgstr "ne mogu napraviti medij \"%s\"\n"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, fuzzy, c-format
 msgid "removing package %s"
 msgstr "Samo je administratoru dozvoljeno da instalira pakete"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, fuzzy, c-format
 msgid "unable to remove package %s"
 msgstr "Samo je administratoru dozvoljeno da instalira pakete"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr ""
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, fuzzy, c-format
 msgid "unable to install package %s"
 msgstr "Samo je administratoru dozvoljeno da instalira pakete"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, fuzzy, c-format
 msgid "due to missing %s"
 msgstr "wget nedostaje\n"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, fuzzy, c-format
 msgid "trying to promote %s"
 msgstr "odabirem %s izabiranjem datoteka"
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, fuzzy, c-format
 msgid "in order to keep %s"
 msgstr "Samo je administratoru dozvoljeno da instalira pakete"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, fuzzy, c-format
 msgid "in order to install %s"
 msgstr "Samo je administratoru dozvoljeno da instalira pakete"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr ""
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr ""
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr ""
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr ""
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr ""
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr ""
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: ne mogu pročitati rpm datoteku \"%s\"\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Žalim, loš odabir, pokušajte ponovo\n"
+
+#: ../urpme:36
 #, fuzzy, c-format
 msgid ""
 "urpme version %s\n"
@@ -844,113 +804,103 @@ msgstr ""
 "\n"
 "uporaba:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help           - ispiši ovaj tekst s pomoći.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, fuzzy, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - automatski izaberi dobar paket u izborima.\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - prisili pozivanje iako neki paketi ne postoje.\n"
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, fuzzy, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --curl         - koristi curl za dohvaćanje udaljenih datoteka.\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - opširan mod.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, fuzzy, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - odabire sve odgovarajuće na komandnoj liniji.\n"
 
-#: ../urpme:68
-#, fuzzy, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: nepoznata opcija \"-%s\", provjerite uporabu sa --help\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, fuzzy, c-format
 msgid "unknown packages"
 msgstr "nepoznati paket(i) "
 
-#: ../urpme:91
+#: ../urpme:83
 #, fuzzy, c-format
 msgid "unknown package"
 msgstr "nepoznati paket(i) "
 
-#: ../urpme:101
+#: ../urpme:93
 #, fuzzy, c-format
 msgid "removing package %s will break your system"
 msgstr "uklanjanje paketa %s će pokvariti vaš sustav\n"
 
-#: ../urpme:103
+#: ../urpme:95
 #, fuzzy, c-format
 msgid "Nothing to remove"
 msgstr "Nema ništa za ukloniti.\n"
 
-#: ../urpme:107
+#: ../urpme:99
 #, fuzzy, c-format
 msgid "Checking to remove the following packages"
 msgstr "Jedan od slijedećih paketa je potreban:"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
 "Kako bi zadovoljili ovisnosti, slijedeći paketi će biti uklonjeni (%d MB)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (d/N) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, fuzzy, c-format
 msgid "removing %s"
 msgstr "Samo je administratoru dozvoljeno da instalira pakete"
 
-#: ../urpme:123
+#: ../urpme:115
 #, fuzzy, c-format
 msgid "Removing failed"
 msgstr "...kopiranje neuspješno"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Žalim, loš odabir, pokušajte ponovo\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, fuzzy, c-format
 msgid ""
 "urpmf version %s\n"
@@ -966,38 +916,38 @@ msgstr ""
 "\n"
 "uporaba:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - koristi samo medije za dogradnju.\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, fuzzy, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - koristi samo medije popisane zarezom.\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, fuzzy, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --media        - koristi samo medije popisane zarezom.\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, fuzzy, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr "  --media        - koristi samo medije popisane zarezom.\n"
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, fuzzy, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  -v             - opširan mod.\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, fuzzy, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1007,152 +957,152 @@ msgstr ""
 "  --quiet         - ne ispisuje ime oznake (podrazumijevano ako nije dana "
 "oznaka na komandnoj"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, fuzzy, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --size          - ispisuje oznaku size: veličinu."
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, fuzzy, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all           - ispiši sve oznake."
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, fuzzy, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group         -ispisuje oznaku group: grupu."
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, fuzzy, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size          - ispisuje oznaku size: veličinu."
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, fuzzy, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --size          - ispisuje oznaku size: veličinu."
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, fuzzy, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary       - ispisuje oznaku summary: sažeto."
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, fuzzy, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description   - ispisuje oznaku description: opis."
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, fuzzy, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr "  --group         -ispisuje oznaku group: grupu."
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, fuzzy, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr "  --group         -ispisuje oznaku group: grupu."
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, fuzzy, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr "  --files         - ispisuje oznaku files: sve datoteke (više linija)."
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, fuzzy, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --serial        - ispisuje oznaku serial: serial."
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, fuzzy, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr ""
 "  --provides      - ispisuje oznaku provides: sve što pruža (više linija)."
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, fuzzy, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr ""
 "  --requires      - ispisuje oznaku requires: sve što zahtjeva (više linija)."
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, fuzzy, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files         - ispisuje oznaku files: sve datoteke (više linija)."
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, fuzzy, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr ""
 "  --conflicts     - ispisuje oznaku conflicts: sve konflikte (više linija)."
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, fuzzy, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr ""
 "  --obsoletes     - ispisuje oznaku obsoletes: sve zastarjele (više linija)."
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
 msgstr ""
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, fuzzy, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr "  -f             - prisili pravljenje hdlist datoteka.\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - ispiši verziju, izdanje i arhitekturu sa imenom.\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, fuzzy, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -c             - očisti keš direktorij zaglavlja.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, fuzzy, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
 msgstr "  -u             - ukloni paket ukoliko bolja inačica već postoji.\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, fuzzy, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  -u             - ukloni paket ukoliko bolja inačica već postoji.\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, fuzzy, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr "  -a             - odabire sve odgovarajuće na komandnoj liniji.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, fuzzy, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr "  -a             - odabire sve odgovarajuće na komandnoj liniji.\n"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
 "%s\n"
 msgstr ""
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1168,32 +1118,32 @@ msgstr ""
 "\n"
 "uporaba:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, fuzzy, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - automatski izaberi pakete za dogradnju sustava.\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr ""
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that leads to remove.\n"
 msgstr ""
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1201,108 +1151,108 @@ msgid ""
 "                   default is %d.\n"
 msgstr ""
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - uključi fuzzy pretraživanje (isto kao -y).\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 "  --src          - slijedeći paket je izvorišni(source) paket (isto kao -"
 "s).\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, fuzzy, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --noclean      - zadrži rpm koji nije korišten u međuspremniku.\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - zadrži rpm koji nije korišten u međuspremniku.\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - koristi wget za dohvaćanje udaljenih datoteka.\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - koristi curl za dohvaćanje udaljenih datoteka.\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
 msgstr ""
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
 msgstr ""
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - koristi X sučelje.\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1311,83 +1261,72 @@ msgstr ""
 "  --best-output  - izaberi najbolje sučelje prema okruženju:\n"
 "                   X ili tekst mod.\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, fuzzy, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --media        - koristi samo medije popisane zarezom.\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr ""
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - odabire sve odgovarajuće na komandnoj liniji.\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 "  -p             - dozvoli pretraživanje u provides kako bi pronašao paket.\n"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 "  -P             - nemoj pretraživati u provides kako bi pronašli paket.\n"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -v             - uključi fuzzy pretraživanje (isto kao --fuzzy).\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 "  -s             - slijedeći paket je izvorišni paket (isto kao --src).\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - tihi mod.\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, fuzzy, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  imena ili rpm datoteke dane na komandnoj liniji se instaliraju.\n"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr ""
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr ""
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: nepoznata opcija \"-%s\", provjerite uporabu sa --help\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1400,22 +1339,22 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr ""
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr ""
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr ""
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1425,66 +1364,66 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, fuzzy, c-format
 msgid "Install it"
 msgstr "Instalacija nije uspjela"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr ""
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, fuzzy, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "ne mogu obraditi ispravno [%s] na vrijednosti \"%s\""
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Samo je administratoru dozvoljeno da instalira pakete"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "Jedan od slijedećih paketa je potreban za instaliranje %s:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Jedan od slijedećih paketa je potreban:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Izaberite jedan? (1-%d) "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr ""
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr ""
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr ""
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1494,7 +1433,7 @@ msgstr ""
 "neki paketi moraju biti uklonjeni da bi mogli biti nadograđeni, ovo još "
 "uvijek nije podržano\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1503,16 +1442,16 @@ msgstr ""
 "neki paketi moraju biti uklonjeni da bi mogli biti nadograđeni, ovo još "
 "uvijek nije podržano\n"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
 "Kako bi zadovoljili sve ovisnosti paketa slijedeći moram instalirati "
 "slijedeće pakete (%d MB)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1521,37 +1460,47 @@ msgstr ""
 "Morate biti administrator(root) kako bi instalirali slijedeće ovisnosti:\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "ne mogu dohvatiti izvorne (source) pakete, prekidam"
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Molim umetnite medij pod nazivom \"%s\" u uređaj [%s]"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, fuzzy, c-format
 msgid "Press Enter when ready..."
 msgstr "Pritisnite Enter kada ste gotovi..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, fuzzy, c-format
 msgid "Downloading package `%s'..."
 msgstr "Samo je administratoru dozvoljeno da instalira pakete"
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr ""
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr ""
+
+#: ../urpmi:606
 #, fuzzy, c-format
 msgid "The following packages have bad signatures"
 msgstr "Slijedeći paketi sadrže %s: %s"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr ""
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, fuzzy, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1561,57 +1510,57 @@ msgstr ""
 "Instalacija neuspješna, neke datoteke nedostaju.\n"
 "Možda ćete poželjeti dograditi vašu urpmi bazu"
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "Instalacija nije uspjela"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, fuzzy, c-format
 msgid "distributing %s"
 msgstr "instaliram %s\n"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, fuzzy, c-format
 msgid "installing %s"
 msgstr "instaliram %s\n"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Pokušati instalaciju bez provjere ovisnosti (d/N) "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Pokušati instalaciju još snažnije (--force)? (d/N) "
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "Instalacija nije uspjela"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, fuzzy, c-format
 msgid "Installation is possible"
 msgstr "Instalacija nije uspjela"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "sve je već instalirano"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr ""
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1636,24 +1585,24 @@ msgstr ""
 "\n"
 "i [opcije] su od\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - napravi medij za dogradnju.\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, fuzzy, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
 "  -h             - pokušaj pronaći i koristiti synthesis ili hdlist "
 "datoteku.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, fuzzy, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
@@ -1662,7 +1611,7 @@ msgstr ""
 "  -h             - pokušaj pronaći i koristiti synthesis ili hdlist "
 "datoteku.\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, fuzzy, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -1670,7 +1619,7 @@ msgid ""
 msgstr ""
 "  --distrib      - automatski napravi sve medije iz instalacijskog medija.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1678,14 +1627,14 @@ msgid ""
 "                   anything else that has been configured ;-)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr ""
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1693,87 +1642,66 @@ msgid ""
 "                   installed mandrake-release package.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
 "                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - očisti keš direktorij zaglavlja.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - prisili pravljenje hdlist datoteka.\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"nepoznata opcija '%s'\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, fuzzy, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "dohvaćam rpms datoteku..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"nema potrebe za davanje <relativne putanje do hdlist> sa --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "nema potrebe za davanje <relativne putanje do hdlist> sa --distrib"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "ne mogu ažurirati medij \"%s\"\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"<relativna putanja do hdlist> nedostaje\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<relativna putanja do hdlist> nedostaje\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, fuzzy, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"`with' nedostaje za ftp medij\n"
+msgid "`with' missing for network media\n"
+msgstr "`with' nedostaje za ftp medij\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "ne mogu napraviti medij \"%s\"\n"
@@ -1792,6 +1720,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - odaberi sve medije.\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"nepoznata opcija '%s'\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1807,7 +1744,7 @@ msgstr ""
 "nedostaje unos za uklanjanje\n"
 "(jedan od %s)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1816,28 +1753,28 @@ msgstr ""
 "uporaba: urpmi.update [opcije] <ime> ...\n"
 "gdje je <ime> ime medija za dogradnju.\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, fuzzy, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - koristi samo medije za dogradnju.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr ""
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - odaberi sve neprenosive medije.\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "nema ništa za nadogradnju (koristite urpmi.addmedia za dodavanje medija)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1846,7 +1783,7 @@ msgstr ""
 "nedostaje unos za nadogradnju\n"
 "(jedan od %s)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1862,38 +1799,38 @@ msgstr ""
 "\n"
 "uporaba:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, fuzzy, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --all           - ispiši sve oznake."
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, fuzzy, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --all           - ispiši sve oznake."
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, fuzzy, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --all           - ispiši sve oznake."
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, fuzzy, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr "  --all           - ispiši sve oznake."
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, fuzzy, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --all           - ispiši sve oznake."
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
@@ -1902,88 +1839,145 @@ msgstr ""
 "  --headers      - izdvoji zaglavlja za pakete popisane iz urpmi baze na\n"
 "                   stdout (root samo).\n"
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 "  --sources      - daj sve izvorne pakete prije skidanja (root samo).\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, fuzzy, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --all           - ispiši sve oznake."
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - proširi ispitivanje ovisnosti paketa.\n"
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, fuzzy, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr "  -u             - ukloni paket ukoliko bolja inačica već postoji.\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, fuzzy, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "                    komandnoj liniji ali bez imena paketa)."
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, fuzzy, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 "  -p             - dozvoli pretraživanje u provides kako bi pronašao paket.\n"
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, fuzzy, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -r             - ispiši verzije i izdanja također sa imenom.\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, fuzzy, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - ispiši groupe također sa imenom.\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, fuzzy, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - ispiši verzije i izdanja također sa imenom.\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, fuzzy, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  --all           - ispiši sve oznake."
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  imena ili rpm datoteke dane na komandnoj liniji se ispituju.\n"
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: nepoznate opcije \"-%s\", provjerite uporabu sa --help\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: ne mogu pročitati rpm datoteku \"%s\"\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, fuzzy, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "  --all           - ispiši sve oznake."
 
+#, fuzzy
+#~ msgid "copy failed: %s"
+#~ msgstr "...kopiranje neuspješno"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "wget nedostaje\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "wget neuspješan: izašao je sa %d ili signalom %d\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "curl nedostaje\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "curl neuspješan: izašao je sa %d ili sa signalom %d\n"
+
+#, fuzzy
+#~ msgid "rsync is missing\n"
+#~ msgstr "curl nedostaje\n"
+
+#, fuzzy
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "curl neuspješan: izašao je sa %d ili sa signalom %d\n"
+
+#, fuzzy
+#~ msgid "ssh is missing\n"
+#~ msgstr "wget nedostaje\n"
+
+#, fuzzy
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmi: nepoznata opcija \"-%s\", provjerite uporabu sa --help\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmi: nepoznata opcija \"-%s\", provjerite uporabu sa --help\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr ""
+#~ "Kako bi zadovoljili sve ovisnosti paketa slijedeći moram instalirati "
+#~ "slijedeće pakete (%d MB)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "nema potrebe za davanje <relativne putanje do hdlist> sa --distrib"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "<relativna putanja do hdlist> nedostaje\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "`with' nedostaje za ftp medij\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmq: nepoznate opcije \"-%s\", provjerite uporabu sa --help\n"
+
 #~ msgid "no webfetch (curl or wget currently) found\n"
 #~ msgstr "nije pronađen niti jedan webfetch (curl ili wget trenutno)\n"
 
diff --git a/po/hu.po b/po/hu.po
index 5c9e8e73..59ba3c8d 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-hu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2003-09-13 23:08+0200\n"
 "Last-Translator: Arpad Biro <biro_arpad@yahoo.com>\n"
 "Language-Team: Hungarian\n"
@@ -54,22 +54,22 @@ msgstr ""
 "A csomagok automatikus telepítése...\n"
 "A(z) %s csomag telepítését kérte...\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "Így rendben van?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Mégsem"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (I/n) "
@@ -79,124 +79,63 @@ msgstr " (I/n) "
 msgid "%s: command not found\n"
 msgstr "%s: a parancs nem található\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "where [options] are from\n"
 msgstr ""
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - jelen segítség megjelenítése\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, fuzzy, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "  --group        - csoport megjelenítése\n"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, fuzzy, c-format
 msgid "                    defaults is %s.\n"
 msgstr "  --list         - az elérhető csomagok listázása\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Ismeretlen letöltőprogram: \"%s\".\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "ismeretlen protokoll van definiálva ehhez: \"%s\""
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "protokollkezelés sikertelen: %s"
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "a másolás sikertelen: %s"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "a wget nem található\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "a wget hibával lépett ki: \"%d\" hibakód vagy \"%d\" szignál\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "a curl nem található\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "a curl hibával lépett ki: \"%d\" hibakód vagy \"%d\" szignál\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "az rsync nem található\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "az rsync hibával lépett ki: \"%d\" hibakód vagy \"%d\" szignál\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "az ssh nem található\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s %% ebből: %s; hátralevő: %s; sebesség: %s"
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s %%; sebesség: %s"
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...a behozatal sikertelen: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "szintaktikai hiba a konfigurációs fájl következő sorában: %s"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 "a(z) \"%s\" adatforrás egy használatban levő fejléclistát próbált használni; "
 "az adatforrás nem kerül feldolgozásra"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 "a(z) \"%s\" adatforrás egy használatban levő listát próbált használni; az "
 "adatforrás nem kerül feldolgozásra"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -205,40 +144,40 @@ msgstr ""
 "a(z) \"%s\" adatforrás nem kezelhető, mivel a listafájlt már használja egy "
 "másik adatforrás"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr "\"%s\" név nem adható az adatforrásnak, mivel már van ilyen név"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 "a(z) \"%s\" adatforrás nem vehető figyelembe, mivel \"%s\" listafájl nem "
 "létezik"
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "a fejléclistához tartozó adatforrás nem határozható meg: \"%s\""
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 "\"%s\" fejléclistája nem elérhető; az adatforrás nem kerül feldolgozásra"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "\"%s\" listafájlja nem elérhető; az adatforrás nem kerül feldolgozásra"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "a(z) \"%s\" néven létező adatforrás elkerülése"
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -247,100 +186,100 @@ msgstr ""
 "a virtuális \"%s\" adatforráshoz nem tartozhat definiált fejléclista vagy "
 "listafájl, ezért az adatforrás nem lesz feldolgozva"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr ""
 "a(z) \"%s\" virtuális adatforrás nem tiszta URL-lel rendelkezik, ezért az "
 "adatforrás nem kerül feldolgozásra"
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 "\"%s\" fejléclistája nem található; az adatforrás nem kerül feldolgozásra"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 "\"%s\" listafájlja nem található; az adatforrás nem kerül feldolgozásra"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr ""
 "hibás listafájl a(z) \"%s\" adatforráshoz; az adatforrás nem kerül "
 "feldolgozásra"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
 "\"%s\" listafájljának vizsgálata sikertelen; az adatforrás nem kerül "
 "feldolgozásra"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "túl sok csatolási pont ehhez a cserélhető adatforráshoz: \"%s\""
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "a cserélhető eszköz a következőnek lesz véve: \"%s\""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "eltérő cserélhető eszköz (\"%s\") használata ehhez: \"%s\""
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "a következő cserélhető adatforrás útvonala nem elérhető: \"%s\""
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "a beállítások mentése nem sikerült: \"%s\""
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "beállítások mentése: \"%s\""
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "\"%s\" elemzése sikertelen a következő fájlban: \"%s\""
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "párhuzamosság vizsgálata a következő fájlban: \"%s\""
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "párhuzamosság van definiálva a következő gépekre: %s"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "a hozzárendelt adatforrás használata párhuzamos módhoz: %s"
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "\"%s\" párhuzamossági opció nem használható"
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -349,93 +288,93 @@ msgstr ""
 "a --synthesis nem használható ezekkel: --media, --excludemedia, --sortmedia, "
 "--update, --parallel"
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "kiterjesztett függőséglista vizsgálata: \"%s\""
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "fejléclista vizsgálata: \"%s\""
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "a(z) \"%s\" virtuális adatforrás nem helyi, ezért nem lesz feldolgozva"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr ""
 "hiba történt a(z) \"%s\" adatforrás fejléclistájának vagy kiterjesztett "
 "függőséglistájának olvasásakor"
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "függőségek meghatározása - második lépés\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "a(z) %s csomag kihagyása"
 
 # %s egy csomag teljes neve
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "csomagfrissítés helyett telepítés szükséges: \"%s\""
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "az rpmdb megnyitása nem sikerült"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "\"%s\" adatforrás már létezik"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr "minden virtuális adatforrásnak helyinek kell lennie"
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "\"%s\" adatforrás felvéve"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "az első telepítési adatforrás nem elérhető"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "fejléclista másolása..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "...a másolás sikertelen"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "...másolás megtörtént"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
@@ -444,43 +383,49 @@ msgstr ""
 "az első telepítési adatforrás nem elérhető (Mandrake/base/hdlists fájl nem "
 "található)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "fejléclista behozatala..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "...behozatal megtörtént"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...a behozatal sikertelen: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "érvénytelen fejléclista-leírás a fejléclista-fájlban: \"%s\""
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "kísérlet történt nem létező adatforrás (\"%s\") kiválasztására"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "több adatforrás kijelölése: \"%s\""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "\"%s\" adatforrás eltávolítása"
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -491,7 +436,7 @@ msgstr ""
 "Lehetséges, hogy az adatforrás létrehozásakor kézzel lett csatolva a "
 "megfelelő könyvtár."
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -500,236 +445,236 @@ msgstr ""
 "a(z) \"%s\" virtuális adatforrás fejléclistája vagy kiterjesztett "
 "függőséglistája nem érvényes, ezért az adatforrás nem kerül feldolgozásra"
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "\"%s\" leírásfájljának másolása..."
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr ""
 "a talált forrás-fejléclista (vagy kiterjesztett függőséglista) MD5-ös "
 "összegének kiszámítása..."
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "az MD5SUM fájl vizsgálata"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 "\"%s\" forrás-fejléclistájának (illetve kiterjesztett függőséglistájának) "
 "másolása..."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr ""
 "a lemásolt forrás-fejléclista (vagy kiterjesztett függőséglista) MD5-ös "
 "ellenőrzőösszegének kiszámítása"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, fuzzy, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "a(z) \"%s\" másolása nem sikerült"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr ""
 "probléma a(z) \"%s\" adatforrás kiterjesztett függőséglistájának olvasásakor"
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "csomagfájlok (RPM) olvasása innen: \"%s\""
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "csomagfájlok (RPM) nem olvashatók innen: \"%s\" - %s"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "csomagfájlok (RPM) nem találhatók: \"%s\""
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 "\"%s\" forrás-fejléclistájának (illetve kiterjesztett függőséglistájának) "
 "behozatala..."
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr ""
 "a csomagkezelő fejléclistát (illetve kiterjesztett függőséglistát) talált: %s"
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr ""
 "a letöltött forrás-fejléclista (vagy a kiterjesztett függőséglista) MD5-ös "
 "összegének kiszámítása folyik"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr "hibás MD5-ös ellenőrzőösszeg"
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr ""
 "a forrás-fejléclista (vagy a kiterjesztett függőséglista) beolvasása nem "
 "sikerült"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "a(z) \"%s\" adatforráshoz nem található fejléclista (hdlist)"
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "A(z) \"%s\" fájl már fel lett használva ugyanezen adatforráson: \"%s\""
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "fejléclista nem elemezhető: \"%s\""
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "a(z) \"%s\" listafájlja nem írható"
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "a(z) \"%s\" adatforrás listafájljának írása"
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "semmi nem került a listafájlba: \"%s\""
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "\"%s\" nyilvánoskulcs-fájljának vizsgálata..."
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...%s kulcs importálva \"%s\" nyilvánoskulcs-fájljából"
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "\"%s\" nyilvánoskulcs-fájlja nem importálható"
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "\"%s\" adatforrás fejléceinek olvasása"
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "fejléclista készítése: \"%s\""
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "kiterjesztett függőséglista készítése ehhez: \"%s\""
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "%d fejléc található a gyorstárban"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "%d elavult fejléc eltávolítása a gyorstárból"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "%s csatolása"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "%s leválasztása"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "bejegyzések áthelyezve a függőséglistában: %s"
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "egyetlen bejegyzés sem került áthelyezésre a függőséglistában"
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "érvénytelen csomagfájlnév: \"%s\""
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "RPM fájl behozatala: \"%s\"..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "a csomagfájl nem elérhető: \"%s\""
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "az RPM csomagfájl nem regisztrálható"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "hiba a helyi csomagok regisztrálásakor"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "nincs ilyen nevű csomag: %s"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "A következő csomagok tartalmazzák a(z) %s komponenst: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "több csomag létezik azonos RPM fájlnévvel: \"%s\""
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "\"%s\" elemzése sikertelen; a helytelen érték: \"%s\""
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -739,62 +684,62 @@ msgstr ""
 "  valószínűleg nem naprakész a tükörkiszolgáló tartalma, ezért más mód lesz "
 "kipróbálva"
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "a(z) \"%s\" adatforrás nem definiálja az RPM fájlok helyét"
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "a csomag nem található: \"%s\""
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "az urpmi adatbázis zárolt"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "a(z) \"%s\" adatforrás nincs kijelölve"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "a(z) \"%s\" csomagfájl (RPM) nem olvasható a(z) \"%s\" adatforrásból"
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "a(z) \"%s\" hibás adatforrás cserélhetőnek van jelölve, pedig nem az"
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "a(z) \"%s\" adatforrás nem elérhető"
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "hibás bevitel: \"%s\""
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "RPM fájlok behozatala a(z) \"%s\" adatforrásból..."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "Előkészítés..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "a tranzakció a következő folyamattal lesz végrehajtva: %d"
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -802,37 +747,37 @@ msgstr ""
 "a telepítési műveletek elkezdődtek ide: %s (eltávolítás=%d, telepítés=%d, "
 "frissítés=%d)"
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr "egy művelet elvégzése nem sikerült"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "a(z) %s csomag eltávolítása folyik"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "a(z) \"%s\" csomag eltávolítása sikertelen"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "csomag hozzáadása - %s (azonosító=%d, eid=%d, frissítés=%d, fájl=%s)"
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "a(z) \"%s\" csomag telepítése sikertelen"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "\"%s\" hiánya miatt"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "\"%s\" igényei miatt"
@@ -850,47 +795,62 @@ msgstr "\"%s\" igényei miatt"
 # continues by not selecting a package which was selected by a promotion (not
 # asked by the user directly but caused by a package which has been upgraded thus
 # breaking existing packages, the promotion concerns this).
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr "a legalkalmasabb \"%s\" keresése"
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr "\"%s\" megtartása érdekében"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "\"%s\" telepítése érdekében"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "ezzel való ütközés miatt: \"%s\""
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr "nem volt kérve"
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Érvénytelen elektronikus aláírás (%s)"
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "Érvénytelen kulcsazonosító (%s)"
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Hiányzó elektronikus aláírás (%s)"
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "helytelen proxy-megadás a parancssorban\n"
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: egy RPM fájl nem olvasható: \"%s\"\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Ezt nem lehet választani, próbálja meg újra\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -906,118 +866,106 @@ msgstr ""
 "\n"
 "Használat:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - jelen segítség megjelenítése\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 "  --auto         - választási lehetőségnél automatikusan választ csomagot\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 "  --test         - annak ellenőrzése, hogy a telepítés végrehajtható-e\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 "  --force        - végrehajtás akkor is, ha néhány csomag nem elérhető\n"
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - elosztott urpmi több számítógép közt\n"
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, fuzzy, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --curl         - a curl használata távoli fájlok letöltésére\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - részletes információ\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - a mintára illeszkedő csomagok kijelölése\n"
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-"urpme: ismeretlen paraméter: \"-%s\". A lehetséges paramétereket\n"
-"a --help paraméter megadásával lehet kilistázni.\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr "ismeretlen csomagok"
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "ismeretlen csomag"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "a(z) \"%s\" csomag eltávolítása tönkreteheti a rendszert"
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr "Nincs mit eltávolítani"
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "Ellenőrzés a következő csomagok eltávolításához"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
 "A függőségek feloldásához a következő csomagok el lesznek távolítva (%d MB)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (i/N) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "\"%s\" eltávolítása"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr "Az eltávolítás sikertelen"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Ezt nem lehet választani, próbálja meg újra\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1033,26 +981,26 @@ msgstr ""
 "\n"
 "Használat:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - csak frissítési adatforrás legyen használva\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 "  --media        - csak a felsorolt (elválasztás: vessző) adatforrások\n"
 "                   használata\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 "  --excludemedia - a felsorolt (elválasztás: vessző) adatforrások\n"
 "                   feldolgozásának mellőzése\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1060,21 +1008,21 @@ msgstr ""
 "  --sortmedia    - az adatforrások sorbarendezése vesszővel elválasztott\n"
 "                   sztringek alapján\n"
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - a megadott kiterjesztett függőséglista használata az\n"
 "                   urpmi-adatbázis helyett\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - részletes információ\n"
 
 # maximális sorhossz: 80 karakter (karakteres terminál sorhossza)
 # "." ne legyen a sztringek végén
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1085,88 +1033,88 @@ msgstr ""
 "parancssorban,\n"
 "                   akkor ez lép életbe; interaktív módban nem használható)\n"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --uniq         - az azonos sorok csak egyszer jelenjenek meg\n"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all          - az összes adat megjelenítése\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group        - csoport megjelenítése\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size         - méret megjelenítése\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --epoch        - generáció megjelenítése\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary      - összefoglaló megjelenítése\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description  - leírás megjelenítése\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr "  --sourcerpm    - a forráscsomag megjelenítése\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr "  --packager     - a csomagkészítő nevének megjelenítése\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr ""
 "  --buildhost    - a csomagkészítéshez használt gép nevének megjelenítése\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --url          - URL megjelenítése\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr "  --provides     - szolgáltatásjegyzék megjelenítése (mindet)\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr "  --requires     - a követelmények megjelenítése (mindet)\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files        - a fájlnevek megjelenítése (mindet)\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr "  --conflicts    - az ütközések megjelenítése (mindet)\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr "  --obsoletes    - az elavult csomagok megjelenítése (mindet)\n"
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
@@ -1175,24 +1123,24 @@ msgstr ""
 "  --env          - megadott környezet használata (általában hibajelentés\n"
 "                   esetében)\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr "  -i             - a minták feldolgozása nem nagybetűérzékeny\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - a névvel együtt a verzió, a kiadásszám és az\n"
 "                   architektúra is jelenjen meg\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - Perl kód közvetlen betevése (perl -e)\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
@@ -1200,7 +1148,7 @@ msgstr ""
 "  -a             - bináris ÉS művelet: akkor igaz, ha mindkét kifejezés "
 "igaz\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
@@ -1208,25 +1156,25 @@ msgstr ""
 "  -o             - bináris VAGY művelet: akkor igaz, ha legalább\n"
 "                   az egyik kifejezés igaz\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 "  !              - unáris NEM művelet: akkor igaz, ha a kifejezés hamis\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
 "  (              - zárójelpár nyitó része; kifejezések csoportosításához\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
 "  )              - zárójelpár záró része; kifejezések csoportosításához\n"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
@@ -1235,12 +1183,12 @@ msgstr ""
 "callback:\n"
 "%s\n"
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "a következő környezet használata: %s\n"
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1256,21 +1204,21 @@ msgstr ""
 "\n"
 "Használat:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - a megadott kiterjesztett függőséglista használata az\n"
 "                   urpmi-adatbázis helyett\n"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 "  --auto-select  - automatikusan kiválasztja a frissíthető csomagokat\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
@@ -1280,7 +1228,7 @@ msgstr ""
 "inkább\n"
 "                   szakadjon félbe a telepítés\n"
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1289,7 +1237,7 @@ msgstr ""
 "  --keep         - a már telepített csomagok megtartása, ha lehetséges - a\n"
 "                   törlést igénylő csomagok nem kerülnek telepítésre\n"
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1301,43 +1249,43 @@ msgstr ""
 "                   telepítése vagy frissítése esetén,\n"
 "                   az alapértelmezés szerinti érték: %d\n"
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 "  --split-length - csökkentett művelethossz használata, az alapértelmezés: %"
 "d\n"
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - fuzzy keresés használata (-y opcióval azonos)\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 "  --src          - a következő csomag egy forráscsomag (-s opcióval azonos)\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 "  --install-src  - csak a forráscsomag telepítése (a programok mellőzése)\n"
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 "  --clean        - RPM fájl eltávolítása a gyorstárból a műveletek előtt\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr ""
 "  --noclean      - a nem használt RPM fájlok maradjanak a gyorstárban\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1347,7 +1295,7 @@ msgstr ""
 "                   telepítését (a felhasználótól érkező megerősítést "
 "követően)\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1359,29 +1307,29 @@ msgstr ""
 "megerősítést\n"
 "                   követően)\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - a wget használata távoli fájlok letöltésére\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - a curl használata távoli fájlok letöltésére\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - a letöltési sebesség korlátozása\n"
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, fuzzy, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1390,7 +1338,7 @@ msgstr ""
 "  --verify-rpm   - RPM-aláírás ellenőrzése telepítés előtt (alapértelmezés:\n"
 "                   bekapcsolt állapot; kikapcsolás: --no-verify-rpm)\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1400,7 +1348,7 @@ msgstr ""
 "alapértelmezés\n"
 "                   szerint 1080 (formátum: <proxygép[:port]>)\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1409,7 +1357,7 @@ msgstr ""
 "  --proxy-user   - proxyhoz használandó felhasználónév és jelszó\n"
 "                   (formátum: <felhasználónév:jelszó>)\n"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1418,12 +1366,12 @@ msgstr ""
 "  --bug          - hibajelentés írása a következő argumentumban megadott\n"
 "                   könyvtárba\n"
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - futtatás az X grafikus felületen\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1432,7 +1380,7 @@ msgstr ""
 "  --best-output  - a lehetőségek közül a legmegfelelőbb felületet\n"
 "                   használja a program: grafikus (X) vagy karakteres\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1441,81 +1389,68 @@ msgstr ""
 "  --verify-rpm   - RPM-aláírás ellenőrzése telepítés előtt (alapértelmezés:\n"
 "                   bekapcsolt állapot; kikapcsolás: --no-verify-rpm)\n"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 "  --excludepath  - bizonyos útvonalak (elválasztás: vessző) kihagyása\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - dokumentációs fájlok kihagyása\n"
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - kijelölés a parancssorban megadott minta szerint\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - csomag keresése a szolgáltatásjegyzékben\n"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 "  -P             - a csomag ne legyen keresve a szolgáltatásjegyzékben\n"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 "  -y             - fuzzy keresés használata (--fuzzy opcióval azonos)\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 "  -s             - a következő csomag egy forráscsomag (--src opcióval "
 "azonos)\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - néma üzemmód\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 "  a parancssorban megadott csomagok illetve RPM fájlok lesznek telepítve\n"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr ""
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "helytelen proxy-megadás a parancssorban\n"
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-"urpmi: ismeretlen paraméter: \"-%s\". A lehetséges paramétereket\n"
-"a --help paraméter megadásával lehet kilistázni.\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr "Mit lehet tenni bináris RPM fájlokkal, ha --install-src van megadva"
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1528,22 +1463,22 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "Ne tegyen semmit"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr ""
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr ""
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1553,56 +1488,56 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, fuzzy, c-format
 msgid "Install it"
 msgstr "A telepítés nem sikerült"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr ""
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr ""
 "A következő könyvtárnak a hibajelentés céljából való létrehozása sikertelen: "
 "\"%s\""
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Csomagok telepítéséhez rendszergazdai jogosultság szükséges"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "A következő csomagok valamelyikére szükség van a(z) %s telepítéséhez:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "A következő csomagok valamelyikére szükség van:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Melyiket választja? (1-%d) "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "Csomagtelepítés..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "Inicializálás..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1611,12 +1546,12 @@ msgstr ""
 "A kért csomagok közül néhányat nem lehet telepíteni:\n"
 "%s"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr "Rendben van így?"
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1627,7 +1562,7 @@ msgstr ""
 "távolítani, hogy a szükséges csomagok frissíthetők legyenek:\n"
 "%s\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1637,15 +1572,15 @@ msgstr ""
 "frissíthetők legyenek:\n"
 "%s"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
 "A függőségek feloldásához a következő csomagok telepítésre kerülnek (%d MB)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1654,37 +1589,47 @@ msgstr ""
 "A következő függőségek telepítéséhez rendszergazdai jogosultság szükséges:\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "a forráscsomagok nem elérhetők, ezért a művelet félbeszakad"
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Helyezze be a(z) \"%s\" nevű adathordozót a(z) \"%s\" meghajtóba"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Amikor elkészült, nyomja le az Enter billentyűt..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "A(z) '%s' csomag letöltése folyik..."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s %% ebből: %s; hátralevő: %s; sebesség: %s"
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s %%; sebesség: %s"
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "A következő csomagok helytelen aláírást tartalmaznak:"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Szeretné folytatni a telepítést?"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1695,57 +1640,57 @@ msgstr ""
 "%s\n"
 "Érdemes lehet frissíteni az urpmi adatbázist."
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "A telepítés nem sikerült"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr "%s elosztása"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr "%s telepítése folyik"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "A(z) '%s' (%s/%s) csomag telepítése..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Próbáljam meg a telepítést a függőségek ellenőrzése nélkül? (i/N) "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Mindenképpen megkíséreljem a telepítést (--force)? (i/N) "
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d telepítési művelet nem sikerült"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "A telepítés elvégezhető"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "Már minden telepítve van"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr ""
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1770,23 +1715,23 @@ msgstr ""
 "\n"
 "az [opciók] pedig a következők lehetnek:\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - frissítési adatforrás létrehozása\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
 "  --probe-synthesis - kiterjesztett függőséglista keresése és felhasználása\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr "  --probe-hdlist - fejléclista keresése és felhasználása\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
@@ -1795,7 +1740,7 @@ msgstr ""
 "  --no-probe     - fejléclista illetve kiterjesztett függőséglista\n"
 "                   keresésének mellőzése\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -1804,7 +1749,7 @@ msgstr ""
 "  --distrib      - az összes adatforrás létrehozása telepítési "
 "adatforrásból\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1815,7 +1760,7 @@ msgstr ""
 "                   részéhez; az XXX lehetséges értékei: main, contrib,\n"
 "                   updates, vagy bármi, ami be lett állítva\n"
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1825,7 +1770,7 @@ msgstr ""
 "                   tükörkiszolgáló-listaként; alapértelmezés:\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1837,7 +1782,7 @@ msgstr ""
 "által\n"
 "                   megadott verzió\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
@@ -1847,7 +1792,7 @@ msgstr ""
 "                   telepített mandrake-release csomag által megadott\n"
 "                   architektúra\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
@@ -1856,73 +1801,52 @@ msgstr ""
 "  --virtual      - virtuális, mindig naprakész adatforrás létrehozása,\n"
 "                   amelynél csak a file:// protokoll használható\n"
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - a fejlécgyorstár könyvtárának kiürítése\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - fejléclista-fájlok létrehozásának kikényszerítése\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"ismeretlen opciók: \"%s\"\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "egy Cooker disztribúció frissítései nem vehetők fel\n"
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "tükörkiszolgálók behozatala: %s..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"<a fejléclista relatív útvonala> --distrib esetén szükségtelen"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "<a fejléclista relatív útvonala> --distrib esetén szükségtelen"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "a(z) \"%s\" adatforrás frissítése nem sikerült\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"<a fejléclista relatív útvonala> hiányzik\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<a fejléclista relatív útvonala> hiányzik\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"hiányzó 'with' paraméter a hálózati adatforrásnál\n"
+msgid "`with' missing for network media\n"
+msgstr "hiányzó 'with' paraméter a hálózati adatforrásnál\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "a(z) \"%s\" adatforrás létrehozása nem sikerült\n"
@@ -1941,6 +1865,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - az összes adatforrás kijelölése\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"ismeretlen opciók: \"%s\"\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1957,7 +1890,7 @@ msgstr ""
 "a törlendő bejegyzés hiányzik\n"
 "(valamelyik ezek közül: %s)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1966,29 +1899,29 @@ msgstr ""
 "Használat: urpmi.update [opciók] <név> ...\n"
 "ahol <név> a frissítendő adatforrás neve.\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - csak frissítési adatforrás legyen frissítve\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr ""
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - az összes nem cserélhető adatforrás kijelölése\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "nincs mit frissíteni (használja az urpmi.addmedia parancsot adatforrás "
 "felvételéhez)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1997,7 +1930,7 @@ msgstr ""
 "a frissítendő bejegyzés hiányzik\n"
 "(valamelyik ezek közül: %s)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -2013,39 +1946,39 @@ msgstr ""
 "\n"
 "Használat:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - az elérhető csomagok listázása\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - az elérhető adatforrások listázása\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, fuzzy, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-media   - az elérhető adatforrások listázása\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 "  --list-nodes   - az elérhető gépek listázása --parallel használata esetén\n"
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - az elérhető párhuzamos aliasok listázása\n"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
@@ -2055,7 +1988,7 @@ msgstr ""
 "                   a standard kimenetre (stdout) - a művelethez\n"
 "                   rendszergazdai jogosultság szükséges\n"
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
@@ -2063,24 +1996,24 @@ msgstr ""
 "  --sources      - a csomagok elérési útjának listázása letöltés előtt\n"
 "                   (rendszergazdai jogosultság szükséges)\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, fuzzy, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --all          - az összes adat megjelenítése\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - a lekérdezés terjedjen ki a csomagfüggőségekre is\n"
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -2088,62 +2021,120 @@ msgid ""
 msgstr ""
 "  -u             - csomag kihagyása, ha már van újabb verzió telepítve\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 "  -c             - teljes információ, az eltávolítandó csomaggal együtt\n"
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - fordított keresés: mi igényli a csomagot\n"
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, fuzzy, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 "  -i             - egyéb információk kiírása könnyen olvasható formában\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - a névvel együtt a csoportok is jelenjenek meg\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr ""
 "  -r             - a névvel együtt a verzió és a kiadásszám is jelenjen meg\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, fuzzy, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  --list         - az elérhető csomagok listázása\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 "  a parancssorban megadott csomagok illetve RPM fájlok lesznek lekérdezve\n"
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-"urpmq: ismeretlen paraméter: \"-%s\". A lehetséges paramétereket a --help "
-"paraméter megadásával lehet kilistázni.\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: egy RPM fájl nem olvasható: \"%s\"\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "a --list-nodes csak a --parallel opcióval használható"
 
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "Ismeretlen letöltőprogram: \"%s\".\n"
+
+#~ msgid "copy failed: %s"
+#~ msgstr "a másolás sikertelen: %s"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "a wget nem található\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "a wget hibával lépett ki: \"%d\" hibakód vagy \"%d\" szignál\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "a curl nem található\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "a curl hibával lépett ki: \"%d\" hibakód vagy \"%d\" szignál\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "az rsync nem található\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "az rsync hibával lépett ki: \"%d\" hibakód vagy \"%d\" szignál\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "az ssh nem található\n"
+
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpme: ismeretlen paraméter: \"-%s\". A lehetséges paramétereket\n"
+#~ "a --help paraméter megadásával lehet kilistázni.\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpmi: ismeretlen paraméter: \"-%s\". A lehetséges paramétereket\n"
+#~ "a --help paraméter megadásával lehet kilistázni.\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr ""
+#~ "A függőségek feloldásához a következő csomagok telepítésre kerülnek (%d "
+#~ "MB)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "<a fejléclista relatív útvonala> --distrib esetén szükségtelen"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "<a fejléclista relatív útvonala> hiányzik\n"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "hiányzó 'with' paraméter a hálózati adatforrásnál\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpmq: ismeretlen paraméter: \"-%s\". A lehetséges paramétereket a --help "
+#~ "paraméter megadásával lehet kilistázni.\n"
+
 #~ msgid "no webfetch (curl or wget currently) found\n"
 #~ msgstr "nem található webes letöltőprogram (curl vagy wget)\n"
 
diff --git a/po/id.po b/po/id.po
index 7707d816..21d3e16b 100644
--- a/po/id.po
+++ b/po/id.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2003-08-13 15:20+0900\n"
 "Last-Translator: Budi Rachmanto <rac@linux-mandrake.com>\n"
 "Language-Team: Indonesian <rac@linux-mandrake.com>\n"
@@ -49,22 +49,22 @@ msgstr ""
 "Instalasi paket otomatis...\n"
 "Anda telah meminta instalasi paket %s\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "Semua beres?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Batal"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/t) "
@@ -74,120 +74,59 @@ msgstr " (Y/t) "
 msgid "%s: command not found\n"
 msgstr "%s: perintah tak tercari\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "where [options] are from\n"
 msgstr ""
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - cetak pesan pertolongan ini.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, fuzzy, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "  --group         - cetak grup tag: grup.\n"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, fuzzy, c-format
 msgid "                    defaults is %s.\n"
 msgstr "  --list         - daftar paket tersedia.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Webfetch tak dikenal `%s' !!!\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "protokol tak dikenal didefinisikan untuk %s"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "gagal menangani protokol: %s"
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "copy gagal: %s"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "wget hilang\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget gagal: keluar dg %d atau sinyal %d\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "curl hilang\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl gagal: keluar dg %d atau sinyal %d\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "rsync hilang\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "rsync gagal: keluar dg %d atau sinyal %d\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "ssh hilang\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% dari %s selesai, perkiraan waktu tiba = %s, laju = %s"
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% selesai, kecepatan = %s"
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...gagal terambil: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "salah syntax dlm file konfigurasi baris %s"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr "media \"%s\" mencoba memakai hdlist yg telah dipakai, media diabaikan"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr "media \"%s\" mencoba memakai list yg telah dipakai, media diabaikan"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -195,37 +134,37 @@ msgid ""
 msgstr ""
 "gagal pakai media \"%s\" sbg file list karena telah dipakai oleh media lain"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr "\"%s\" telah dipakai, tak dapat digunakan utk media tak bernama"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr "media \"%s\" tak terpakai karena file daftar [%s] tak ada"
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "gagal tentukan media file hdlist [%s] ini"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "gagal mengakses file hdlist \"%s\", media diabaikan"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "gagal mengakses file list \"%s\", media diabaikan"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "coba bypass media \"%s\", abaikan"
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -233,92 +172,92 @@ msgid ""
 msgstr ""
 "media maya \"%s\" tak boleh menentukan file list/hdlist, media diabaikan"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "media maya \"%s\" harus punya url jelas, media diabaikan"
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "gagal temukan file hdlist \"%s\", media diabaikan"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "gagal cari file daftar \"%s\", media diabaikan"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "file list \"%s\" tak koheren, media diabaikan"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "gagal periksa file daftar \"%s\", media diabaikan"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "terlalu banyak titik sambung utk media removable \"%s\""
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "ambil perangkat removable sbg \"%s\""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "pakai removable device lain [%s] untuk \"%s\""
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "tak dapat mengambil nama path utk media removable \"%s\""
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "gagal tulis file konfigurasi [%s]"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "tulis file konfigurasi [%s]"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "gagal menelaah \"%s\" di file [%s]"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "pemeriksaan handler paralel di file [%s]"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "ditemukan handler paralel utk node: %s"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "gunakan media terkait utk mode paralel: %s"
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "gagal menggunakan opsi paralel \"%s\""
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -327,90 +266,90 @@ msgstr ""
 "--synthesis tak dapat dipakai dg --media, --excludemedia, --sortmedia, --"
 "update atau --parallel"
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "periksa file sintesa [%s]"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "periksa baca file hdlist [%s]"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "media maya \"%s\" bukan lokal, media diabaikan"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "masalah dalam membaca file sintesa/hdlist media \"%s\""
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "pembilasan kedua untuk menghitung ketergantungan\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "lewatkan paket %s"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "paket %s akan diinstal, bukan diupgrade"
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "gagal buka rpmdb"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "media \"%s\" telah ada"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr "media maya (virtual) harus lokal"
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "media %s ditambahkan"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "gagal mengakses media instalasi pertama"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "sedang menyalin file hdlist..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "...copy gagal"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "copy selesai"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
@@ -419,43 +358,49 @@ msgstr ""
 "gagal mengakses media instalasi pertama (file Mandrake/base/hdlists tak "
 "ditemukan)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "ambil file hdlist..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "pengambilan selesai"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...gagal terambil: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "deskripsi hdlist \"%s\" di file hdlist tak berlaku"
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "sedang mencoba memilih media tak eksis \"%s\""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "memilih media majemuk: %s"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "hapus media \"%s\""
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -466,7 +411,7 @@ msgstr ""
 "ini bisa terjadi jika Anda me-mount direktori secara manual saat membuat "
 "media."
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -474,222 +419,222 @@ msgid ""
 msgstr ""
 "media maya \"%s\" harus punya source hdlist/sintesa yg valid, media diabaikan"
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "file deskripsi \"%s\" sedang disalin"
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "sedang menghitung md5sum hdlist source (atau sintesa)"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "periksa file MD5SUM"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "sedang menyalin sumber/sintesa hdlist \"%s\"..."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, fuzzy, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "wget [%s] gagal (mungkin wget hilang?)"
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "sedang menghitung md5sum hdlist/sintesa source tersalin"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, fuzzy, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "gagal salin [%s]"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "sulit membaca file sintesa hdlist utk media \"%s\""
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "baca file rpm dari [%s]"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "gagal baca file rpm dari [%s]: %s"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "tiada file rpm tertemukan dari [%s]"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "ambil hdlist source (atau sintesa) \"%s\"..."
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "ditemukan hdlist (atau sintesa) terselidik sbg %s"
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "hitung md5sum hdlist source (atau sintesa) yg diambil"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr "md5sum tak cocok"
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "gagal mengambil hdlist (atau sintesa) source"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "file hdlist utk media \"%s\" tak ditemukan"
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "file [%s] telah dipakai dalam media yang sama \"%s\""
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "gagal olah file hdlist \"%s\""
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "gagal baca file list \"%s\""
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "penulisan file list media \"%s\""
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "tak ada yg ditulis dlm file daftar \"%s\""
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "periksa file pubkey \"%s\"..."
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, fuzzy, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "gagal impor file pubkey \"%s\""
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "gagal impor file pubkey \"%s\""
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "baca header dari media \"%s\""
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "bangun hdlist [%s]"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "bangun file sintesa hdlist utk media \"%s\""
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "temukan %d header di cache"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "hapus %d header kadaluarsa dlm cache"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "gandeng %s"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "lepas mount %s"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "%s entri di depslist direlokasikan"
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "tiada entri di depslist direlokasikan"
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "nama file rpm [%s] tak berlaku"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "ambil file rpm [%s] ..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "gagal akses file rpm [%s]"
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "registrasi file rpm gagal"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "salah registrasi paket lokal"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "tiada paket bernama %s"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Paket berikut berisi %s: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "banyak paket dg nama file rpm sama \"%s\""
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "gagal olah dg benar [%s] pada nilai \"%s\""
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -698,143 +643,158 @@ msgstr ""
 "media \"%s\" menggunakan file daftar yg tak berlaku:\n"
 "  mirror mungkin tak up-to-date, coba gunakan metode alternatif"
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "media \"%s\" tak mendefinisikan lokasi file rpm"
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "paket %s tak tertemukan."
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "database urpmi terkunci"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "media \"%s\" tak dipilih"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "gagal baca file rpm [%s] dari media \"%s\""
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "media nonkoheren \"%s\" bertanda removable, seharusnya tidak"
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "gagal akses media \"%s\""
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "input cacat: [%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "ambil file rpm dari media \"%s\"..."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "Persiapan..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr ""
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr "transaksi utk instalasi di %s (hapus=%d, instal=%d, upgrade=%d)"
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr "gagal membuat transaksi"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "paket %s sedang dihapus"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "paket %s tak dapat dihapus"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "tambah paket %s (id=%d, eid=%d, update=%d, file=%s)"
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "gagal menginstal paket %s"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "karena %s hilang"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "karena %s tak dipenuhi"
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr "promosikan %s"
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr "utk menjaga %s"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "utk instalasi %s"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "karena konflik dg %s"
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr "tak diminta"
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Tanda tangan tak berlaku (%s)"
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "Kunci ID Tak Berlaku (%s)"
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Tanda tangan hilang (%s)"
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "deklarasi proxy buruk di baris perintah\n"
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: tak dapat membaca file rpm \"%s\"\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Salah pilih, coba lagi\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -850,114 +810,104 @@ msgstr ""
 "\n"
 "pemakaian:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - cetak pesan pertolongan ini.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - seleksi otomatis paket pilihan.\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 "  --test         - verifikasi apakah instalasi dapat dilaksanakan dg benar.\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - paksa instal meski bbrp paket tak ada.\n"
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - urpmi tersebar di antara mesin-mesin alias.\n"
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, fuzzy, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --curl         - pakai curl utk mengambil file jauh.\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - mode detil.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - pilih semua paket yg cocok dg ekspresi.\n"
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: opsi \"-%s\" tak dikenal, cek pemakaian dg --help\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr "paket tak dikenal"
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "paket tak dikenal"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "sistem akan rusak jika paket %s dihapus"
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr "Tiada yang dihapus"
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "Cek penghapusan paket berikut"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
 "Paket berikut akan dihapus agar syarat ketergantungan terpenuhi (%d MB)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (y/T) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "hapus %s"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr "Gagal dihapus"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Salah pilih, coba lagi\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -973,40 +923,40 @@ msgstr ""
 "\n"
 "pemakaian:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - pakai hanya media update.\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - pakai hanya media yg diberikan, dipisahkan koma.\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 "  --excludemedia - jangan pakai media yg diberikan (pisahkan dg koma).\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 "  --sortmedia    - sortir media menurut substring yg dipisahkan dg koma.\n"
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr "  --synthesis    - gunakan synthesis yang diberikan, bukan db urpmi.\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - mode detil.\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1016,139 +966,139 @@ msgstr ""
 "  --quiet        - jangan cetak nama tag (standar jika tiada tag pada baris\n"
 "                   perintah, tak kompatibel dg mode interaktif).\n"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --uniq         - jangan cetak baris identik.\n"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all          - cetak semua tag.\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group         - cetak grup tag: grup.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size          - cetak ukuran tag: ukuran.\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --size          - cetak ukuran tag: ukuran.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary       - cetak ringkasan tag: ringkasan.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description   - cetak penjelasan tag: penjelasan.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr "  --sourcerpm    - cetak sourcerpm tag: rpm source.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr "  --packager     - cetak pemaket tag: pemaket.\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr "  --buildhost    - cetak buildhost tag: host pembangun.\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --url          - cetak tag url: url.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr "  --provides     - cetak sediaan tag: semua sediaan.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr "  --requires     - cetak kebutuhan tag: semua kebutuhan.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files        - cetak file tag: semua file.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr "  --conflicts    - cetak konflik tag: semua konflik.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr "  --obsoletes    - cetak kadaluarsa tag: semua kadaluarsa.\n"
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
 msgstr "  --env          - gunakan lingkungan khusus (umumnya laporan kutu).\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
 "  -i             - abaikan perbedaan huruf besar/kecil dlm tiap pola.\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - cetak versi, release dan arch dg nama.\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - cakup kode perl secara langsung sbg perl -e.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 "  -a             - operator AND biner, benar jika kedua ekspresi benar.\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 "  -o             - operator OR biner, benar jika salah satu ekspresi benar.\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - NOT uner, benar jika ekspresi = salah.\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr "  (              - tanda kurung kiri utk membuka ekspresi grup.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr "  )              - tanda kurung kanan utk menutup ekspresi grup.\n"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
@@ -1157,12 +1107,12 @@ msgstr ""
 "callback adalah :\n"
 "%s\n"
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "gunakan lingkungan spesifik di %s\n"
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1178,25 +1128,25 @@ msgstr ""
 "\n"
 "pemakaian:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - gunakan sintesa yang diberikan, bukan db urpmi.\n"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - otomatis menyeleksi paket utk upgrade sistem.\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr "  --no-uninstall - jangan tanya uninstal paket, batalkan instalasi.\n"
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1205,7 +1155,7 @@ msgstr ""
 "  --keep         - sebisa mungkin menjaga paket, tolak permintaan paket yg\n"
 "                   bisa menghapus paket yg sudah ada.\n"
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1216,37 +1166,37 @@ msgstr ""
 "                   upgrade lebih banyak daripada yg diberikan,\n"
 "                   standarnya %d.\n"
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - panjang transaksi kecil, standarnya %d.\n"
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - lakukan pencarian fuzzy (sama dengan -y).\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - paket berikut adalah paket sumber (sama dg -s).\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - instal hanya paket source (tanpa kode biner).\n"
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - hapus rpm dari cache sebelum hal-hal yg lain.\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - jaga rpm tak dipakai di cache.\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1255,7 +1205,7 @@ msgstr ""
 "  --allow-nodeps - izinkan meminta user utk menginstal paket tanpa\n"
 "                   mencek ketergantungan.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1264,29 +1214,29 @@ msgstr ""
 "  --allow-force  - izinkan meminta user menginstal paket tanpa\n"
 "                   mencek ketergantungan dan integritas.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - pakai wget utk mengambil file jauh.\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - pakai curl utk mengambil file jauh.\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - batasi laju download.\n"
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, fuzzy, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1295,7 +1245,7 @@ msgstr ""
 "  --verify-rpm   - verifikasi tandatangan rpm sebelum instalasi.\n"
 "                   (nonaktif dg --no-verify-rpm, default adalah aktif).\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1304,7 +1254,7 @@ msgstr ""
 "  --proxy        - gunakan proksi HTTP tertentu, nomor port dianggap\n"
 "                   1080 secara standar (dg format <hostproxy[:port]>).\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1313,7 +1263,7 @@ msgstr ""
 "  --proxy-user   - tentukan user dan katakunci utk otentikasi proxy\n"
 "                   (dg format <user:katakunci>).\n"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1322,12 +1272,12 @@ msgstr ""
 "  --bug          - keluarkan laporan bug ke direktori yg ditentukan oleh\n"
 "                   arg. berikut.\n"
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - pakai antarmuka X.\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1336,7 +1286,7 @@ msgstr ""
 "  --best-output  - pilih antarmuka terbaik menurut lingkungan:\n"
 "                   X atau mode teks.\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1345,75 +1295,64 @@ msgstr ""
 "  --verify-rpm   - verifikasi tandatangan rpm sebelum instalasi.\n"
 "                   (nonaktif dg --no-verify-rpm, default adalah aktif).\n"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - path pengecualian, dipisah oleh koma.\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr ""
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - pilih semua yg cocok dg baris perintah.\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - izinkan search di provides utk mencari paket.\n"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - jangan cari di provides utk mencari paket.\n"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - lakukan pencarian fuzzy (sama dengan --fuzzy).\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 "  -s             - paket berikut adalah paket sumber (sama dg --src).\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - mode diam.\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  nama atau file rpm yg tertera pada baris perintah akan diinstal.\n"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr ""
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "deklarasi proxy buruk di baris perintah\n"
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: opsi \"-%s\" tak dikenal, cek pemakaian dg --help\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 "Apa yg dapat dilakukan dg file rpm biner saat menggunakan --install-src"
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1426,22 +1365,22 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "Menganggur"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr ""
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr ""
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1451,54 +1390,54 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, fuzzy, c-format
 msgid "Install it"
 msgstr "Instalasi gagal"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr ""
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "gagal membuat direktori [%s] untuk laporan kutu"
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Hanya superuser yang boleh meng-instal paket"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "Salah satu paket berikut dibutuhkan utk instalasi %s:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Salah satu paket berikut dibutuhkan:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Pilihan Anda? (1-%d) "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "Instalasi paket..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "Inisialisasi..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1507,12 +1446,12 @@ msgstr ""
 "Beberapa paket tak dapat diinstal:\n"
 "%s"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr "setuju ?"
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1523,7 +1462,7 @@ msgstr ""
 "agar yang lain dapat di-upgrade:\n"
 "%s\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1532,15 +1471,15 @@ msgstr ""
 "Paket berikut harus dihapus agar yang lain dapat di-upgrade:\n"
 "%s"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
 "Paket berikut akan di-install agar syarat ketergantungan terpenuhi (%d MB)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1549,37 +1488,47 @@ msgstr ""
 "Anda perlu jadi root untuk menginstal ketergantungan berikut:\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "tak dapat mengambil paket asal, batal"
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Masukkan media \"%s\" ke perangkat [%s]"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Tekan [Enter] jika siap.."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Ambil paket `%s'..."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% dari %s selesai, perkiraan waktu tiba = %s, laju = %s"
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% selesai, kecepatan = %s"
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Paket berikut berisi tandatangan tak benar"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Teruskan instalasi ?"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1590,57 +1539,57 @@ msgstr ""
 "%s\n"
 "Anda mungkin perlu meng-update database urpmi"
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "Instalasi gagal"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr "sebarkan %s"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr "instalasi %s"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instalasi paket `%s' (%s/%s)..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Coba instalasi tanpa cek ketergantungan? (y/T) "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Coba instalasi lebih keras (--force)? (y/T) "
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "transaksi instalasi %d gagal"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "Instalasi dimungkinkan"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "semua telah terinstal"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr ""
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1664,22 +1613,22 @@ msgstr ""
 "\n"
 "dan [opsi] dari\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - buat media update.\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr "  --probe-synthesis - coba cari dan gunakan file sintesa.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr "  --probe-hdlist - coba cari dan gunakan file hdlist.\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
@@ -1688,7 +1637,7 @@ msgstr ""
 "  --no-probe     - jangan coba cari file hdlist / sintesa.\n"
 "\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -1696,7 +1645,7 @@ msgid ""
 msgstr ""
 "  --distrib      - buat semua media dari media instalasi dg otomatis.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1707,7 +1656,7 @@ msgstr ""
 "                   XXX dapat berupa main, contrib, updates atau apa saja\n"
 "                   yg telah dikonfigurasikan ;-)\n"
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1716,7 +1665,7 @@ msgstr ""
 "  --from         - gunakan url yg ditunjuk utk daftar mirror, aslinya\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1726,7 +1675,7 @@ msgstr ""
 "  --version      - pakai versi distribusi yg ditentukan, standarnya diambil\n"
 "                   dari versi distribusi paket mandrake-release terinstal.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
@@ -1735,7 +1684,7 @@ msgstr ""
 "  --arch         - pakai arsitektur yg ditentukan, standarnya adalah\n"
 "                   arsitektur paket mandrake-release terinstal.\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
@@ -1744,73 +1693,52 @@ msgstr ""
 "  --virtual      - buat media maya yg selalu up-to-date,\n"
 "                   hanya protokol file:// yg diizinkan.\n"
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - bersihkan direktori cache header.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - paksa buat file hdlist.\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"opsi tak dikenal '%s'\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "gagal menambahkan update distribusi cooker\n"
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "ambil mirror di %s ..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"tak perlu memberikan <path relatif hdlist> dg --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "tak perlu memberikan <path relatif hdlist> dg --distrib"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "gagal update media \"%s\"\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"<path relatif hdlist> hilang\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<path relatif hdlist> hilang\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"`with' tak tercantum utk media jaringan\n"
+msgid "`with' missing for network media\n"
+msgstr "`with' tak tercantum utk media jaringan\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "gagal membuat media \"%s\"\n"
@@ -1829,6 +1757,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - pilih semua media.\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"opsi tak dikenal '%s'\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1843,7 +1780,7 @@ msgstr ""
 "masukan utk penghapusan hilang\n"
 "(satu dari %s)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1852,27 +1789,27 @@ msgstr ""
 "pemakaian: urpmi.update [opsi] <nama> ...\n"
 "<nama> adalah media yg akan di-update.\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - update hanya media update.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr ""
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - pilih semua media non-removable.\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "tak ada update (pakailah urpmi.addmedia utk tambah media)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1881,7 +1818,7 @@ msgstr ""
 "masukan update hilang\n"
 "(satu dari %s)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1897,38 +1834,38 @@ msgstr ""
 "\n"
 "usage:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - daftar paket tersedia.\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - daftar media tersedia.\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, fuzzy, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-media   - daftar media tersedia.\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr "  --list-nodes   - daftar node tersedia saat menggunakan --parallel.\n"
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - daftar alias paralel.\n"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
@@ -1937,31 +1874,31 @@ msgstr ""
 "  --headers      - keluarkan header packet terdaftar dari dalam db urpmi ke\n"
 "                   stdout (hanya root).\n"
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 "  --sources      - beri semua paket source sebelum download (hanya only).\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, fuzzy, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --all          - cetak semua tag.\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - tambah pencarian ke ketergantungan paket.\n"
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -1969,56 +1906,109 @@ msgid ""
 msgstr ""
 "  -u             - hapus paket jika versi yg lebih baru telah terinstal.\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - keluaran lengkap dg paket yg akan dihapus.\n"
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - apa yg memerlukan paket ini.\n"
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, fuzzy, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -i             - cetak info penting dalam format yg dapat dibaca.\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - cetak grup dg nama juga.\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - juga cetak versi dan release dg nama.\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, fuzzy, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  --list         - daftar paket tersedia.\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  dicarikan nama atau file rpm yg tertera pada baris perintah.\n"
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: opsi asing \"-%s\", cek pemakaian dg --help\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: tak dapat membaca file rpm \"%s\"\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes hanya dapat dipakai dg --parallel"
 
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "Webfetch tak dikenal `%s' !!!\n"
+
+#~ msgid "copy failed: %s"
+#~ msgstr "copy gagal: %s"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "wget hilang\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "wget gagal: keluar dg %d atau sinyal %d\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "curl hilang\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "curl gagal: keluar dg %d atau sinyal %d\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "rsync hilang\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "rsync gagal: keluar dg %d atau sinyal %d\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "ssh hilang\n"
+
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpme: opsi \"-%s\" tak dikenal, cek pemakaian dg --help\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmi: opsi \"-%s\" tak dikenal, cek pemakaian dg --help\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr ""
+#~ "Paket berikut akan di-install agar syarat ketergantungan terpenuhi (%d MB)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "tak perlu memberikan <path relatif hdlist> dg --distrib"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "<path relatif hdlist> hilang\n"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "`with' tak tercantum utk media jaringan\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmq: opsi asing \"-%s\", cek pemakaian dg --help\n"
+
 #~ msgid "no webfetch (curl or wget currently) found\n"
 #~ msgstr "tiada webfetch (curl / wget) ditemukan\n"
 
diff --git a/po/is.po b/po/is.po
index 19136fba..4e15e915 100644
--- a/po/is.po
+++ b/po/is.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2004-03-02 23:43+0000\n"
 "Last-Translator: Pjetur G. Hjaltason <pjetur@pjetur.net>\n"
 "Language-Team: Icelandic <isl@molar.is>\n"
@@ -49,22 +49,22 @@ msgid ""
 "You requested installation of package %s\n"
 msgstr ""
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "Er það í lagi?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "Í lagi"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Hætta við"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (J/n) "
@@ -74,382 +74,327 @@ msgstr " (J/n) "
 msgid "%s: command not found\n"
 msgstr ""
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "where [options] are from\n"
 msgstr ""
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - prenta þetta.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr ""
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, fuzzy, c-format
 msgid "                    defaults is %s.\n"
 msgstr "  -l             - lista skrár í pakka.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr ""
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr ""
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr ""
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "Afritun mistókst: %s"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr ""
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr ""
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr ""
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr ""
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr ""
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr ""
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr ""
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr ""
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr ""
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...mistókst að sækja: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr ""
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
 "medium"
 msgstr ""
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr ""
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
 "ignored"
 msgstr ""
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "gat ekki kannað skráarlista fyrir \"%s\", miðill hunsaður"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr ""
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr ""
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr ""
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr ""
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr ""
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr ""
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr ""
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr ""
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
 "update or --parallel"
 msgstr ""
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr ""
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr ""
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "Fer yfir í annað sinn til að athuga hvað er háð\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "sleppi pakka %s"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr ""
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "gat ekki opnað rpmdb"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr ""
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr ""
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr ""
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr ""
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "...afritun brást"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr ""
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
 "found)"
 msgstr ""
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr ""
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "...niðurhali lokið"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...mistókst að sækja: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr ""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -457,372 +402,387 @@ msgid ""
 "medium."
 msgstr ""
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
 "ignored"
 msgstr ""
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr ""
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr ""
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "afrit af [%s] brást (skráin er grunsamlega lítil)"
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr ""
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "afrit af [%s] brást (md5sum passar ekki)"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr ""
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr ""
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr ""
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr ""
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr ""
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr ""
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "athuga lykilskrá \"%s\"..."
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr ""
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "Fann %d hausa á biðsvæði"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "tengi %s"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "Aftengi %s"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr ""
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr ""
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "sæki rpm skrá [%s] ..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr ""
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr ""
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "Enginn '%s' pakki"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Eftirfarandi pakkar innihalda %s: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "það eru margir pakkar með sama rpm skráaarnafn \"%s\""
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr ""
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
 "  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr ""
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr ""
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi gagnagrunnur læstur"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr ""
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr ""
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr ""
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr ""
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr ""
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "fjarlægi pakka %s"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr ""
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "bæti við pakka %s (id=%d, eid=%d, update=%d, file=%s)"
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr ""
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr ""
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr ""
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr ""
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr ""
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr ""
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr ""
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr ""
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr ""
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr ""
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr ""
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr ""
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Slæmt val.  Reyndu aftur\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -833,114 +793,104 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - prenta þetta.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - Nota aðra rót fyrir rpm uppsetningu.\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - ítarlegri hamur.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr "óþekktir pakkar"
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "Óþekktur pakki"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr ""
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr ""
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr ""
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
 "Til að uppfylla innsetningarkröfur verða eftirtaldir pakkar fjarlægðir (%d "
 "MB)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (J/n) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "fjarlægi %s"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr ""
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Slæmt val.  Reyndu aftur\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -956,38 +906,38 @@ msgstr ""
 "\n"
 "notkun:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr ""
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -995,148 +945,148 @@ msgid ""
 "                   line, incompatible with interactive mode).\n"
 msgstr ""
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --uniq         - ekki prenta tvíteknar línur.\n"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr ""
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr ""
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr ""
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr ""
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr ""
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr ""
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr ""
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr "--packager      - prenta tag pakkara: Pakkað af\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr ""
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --serial        - prenta tag url: url.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr "  --provides     - prenta hvað tag skaffar: allt sem er skaffað.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr "  --requires      - prenta þarfir tags: allar þarfir\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files         - prenta skrár tags: allar skrár\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr "  --conflicts     - prentar ósamræmi við tag: öll ósamræmi\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr "  --obsoletes     - prentar úrelt tög: öll úrelt\n"
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
 msgstr ""
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
 "%s\n"
 msgstr ""
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1147,32 +1097,32 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr ""
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that leads to remove.\n"
 msgstr ""
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1180,87 +1130,87 @@ msgid ""
 "                   default is %d.\n"
 msgstr ""
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - setja aðeins inn frumkóða-pakka (engin forrit).\n"
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr ""
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - Nota curl til að ná í skrár.\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1269,99 +1219,88 @@ msgstr ""
 "  --proxy-user   - skilgreindu sel-notanda og lykilorð til að nota til\n"
 "                   að auðkenna (snið er <user:password>).\n"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
 msgstr ""
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
 "                   X or text mode.\n"
 msgstr ""
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr ""
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr ""
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr ""
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1374,22 +1313,22 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "Gera ekkert"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr ""
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr ""
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1399,66 +1338,66 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, c-format
 msgid "Install it"
 msgstr "Setja það inn"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr ""
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr ""
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr ""
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "Eins af eftirtöldum pökkum er þörf til að setja inn %s:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Krefst einnig eins af af eftirtöldum pökkum:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Hvað viltu? (1-%d) "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "Pakka innsetning..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "Frumstilli..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr "Ertu sammála ?"
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1466,7 +1405,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1475,53 +1414,63 @@ msgstr ""
 "Eftirfarandi pakka þarf að fjarlægja til að uppfæra aðra:\n"
 "%s"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
 "Til að uppfylla innsetningarkröfur verða eftirtaldir pakkar settir inn (%d "
 "MB)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
 "%s\n"
 msgstr ""
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Vinsamlega settu inn %s %s"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Sláðu á ENTER þegar tilbúinn..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Sæki pakka `%s'..."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr ""
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr ""
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Eftirfarandi pakkar eru með gallaðar undirskriftir"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr ""
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1529,57 +1478,57 @@ msgid ""
 "You may want to update your urpmi database"
 msgstr ""
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "Innsetning brást"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr "miðla %s"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr "Set inn %s"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Set inn pakka `%s' (%s/%s)..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Prófa innsetningu án þess að athuga hvaða skrár þarf? (j/N) "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Prófa sterkari innsetningu (--force)? (j/N) "
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d Innsetningarfærslur brugðust"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "Innsetning er möguleg"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "Allt er nú þegar komið inn"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr ""
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1594,36 +1543,36 @@ msgid ""
 "and [options] are from\n"
 msgstr ""
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
 "                   hdlist file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1631,14 +1580,14 @@ msgid ""
 "                   anything else that has been configured ;-)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr ""
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1646,79 +1595,66 @@ msgid ""
 "                   installed mandrake-release package.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
 "                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - hreinsa hausa möppu.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr ""
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr ""
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr ""
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
+msgid "<relative path of hdlist> missing\n"
 msgstr ""
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
+msgid "`with' missing for network media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr ""
@@ -1735,6 +1671,13 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr ""
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1747,41 +1690,41 @@ msgid ""
 "(one of %s)\n"
 msgstr ""
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
 msgstr ""
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr ""
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr ""
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
 "(one of %s)\n"
 msgstr ""
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1792,123 +1735,123 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr ""
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr ""
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr ""
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr ""
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - prenta breytingasögu.\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr ""
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr ""
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr ""
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - lista skrár í pakka.\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: ../urpmq:160
+#: ../urpmq:147
 #, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgid "--list-nodes can only be used with --parallel"
 msgstr ""
 
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr ""
+#~ msgid "copy failed: %s"
+#~ msgstr "Afritun mistókst: %s"
 
-#: ../urpmq:216
-#, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr ""
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr ""
+#~ "Til að uppfylla innsetningarkröfur verða eftirtaldir pakkar settir inn (%"
+#~ "d MB)"
 
 #~ msgid "Installation failed on node %s"
 #~ msgstr "Innsetning brást á hnút %s"
diff --git a/po/it.po b/po/it.po
index aaee09a2..be7f50d6 100644
--- a/po/it.po
+++ b/po/it.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-it\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2004-02-28 17:17+0100\n"
 "Last-Translator: Ruggero Tonelli <ruggero@valtellinux.it>\n"
 "Language-Team: Italiano <it@li.org>\n"
@@ -58,22 +58,22 @@ msgstr ""
 "Installazione automatica dei pacchetti...\n"
 "Avete richiesto l'installazione del pacchetto %s\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "E' corretto?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Annulla"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (S/n) "
@@ -83,122 +83,61 @@ msgstr " (S/n) "
 msgid "%s: command not found\n"
 msgstr "%s: comando non trovato\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "where [options] are from\n"
 msgstr ""
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - stampa questo messaggio di aiuto.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, fuzzy, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr ""
 "  --group         - stampa il tag group: gruppo al quale appartiene il "
 "pacchetto.\n"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, fuzzy, c-format
 msgid "                    defaults is %s.\n"
 msgstr "  -l         - elenca i file presenti in un pacchetto.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Webfetch sconosciuto `%s' !!!\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "protocollo definito per %s  sconosciuto"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "non è stato trovato nessun webfetch, quelli supportati sono: %s\n"
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "non riesco a gestire il protocollo: %s"
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "copia fallita: %s"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "wget non è presente \n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget fallito: terminato con %d o segnale %d\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "curl non è presente\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl fallito: terminato con %d o segnale %d\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "rsync non è presente\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "rsync fallito: terminato con %d o segnale %d\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "ssh non è presente\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% di %s completati, ETA = %s, velocità= %s"
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% completati, velocità= %s"
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...recupero fallito: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "errore di sintassi nel file di configurazione alla riga %s"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr "il supporto \"%s\" cerca di usare una hdlist già usata, lo ignoro"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr "il supporto \"%s\" cerca di usare una lista già usata, lo ignoro"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -207,41 +146,41 @@ msgstr ""
 "non risco ad occuparmi del supporto \"%s\", il file list è già usato da un "
 "altro supporto"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 "non posso usare il nome \"%s\" per il supporto sconosciuto perchè è già in "
 "uso"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 "non riesco a prendere in considerazione il supporto \"%s\" poichè non esiste "
 "una lista dei file [%s]"
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "non riesco a determinare il supporto di questo file hdlist [%s]"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "non riesco ad accedere al file hdlist di \"%s\", ignoro il supporto"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "non riesco ad accedere il file list di \"%s\", ignoro il supporto"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "cerco di fare a meno del supporto esistente \"%s\", evito"
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -250,95 +189,95 @@ msgstr ""
 "il supporto virtuale \"%s\" non dovrebbe avere un file hdlist o list,\n"
 "il supporto sarà ignorato"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr ""
 "il supporto virtuale \"%s\" dovrebbe aver una url chiara, supporto ignorato."
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "non riesco a trovare l'hdlist file per \"%s\", supporto ignorato"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "non riesco a trovare il file list per \"%s\", ignoro il supporto"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "lista dei file incoerente per \"%s\", ignoro il supporto"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
 "non riesco ad analizzare la lista dei file per \"%s\", ignoro il supporto"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "troppi punti di mount per il supporto removibile \"%s\""
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "considero il device rimovibile come \"%s\""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "sto usando un diverso dispositivo rimovibile [%s] per \"%s\""
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "non riesco a recuperare il percorso per il supporto removibile \"%s\""
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "non riesco a scrivere sul file di configurazione [%s]"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "scrivi il file di configurazione [%s]"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 "Non è possibile usare la modalità\"parallel\" con quella \"use-distrib\""
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "non riesco ad effettuare il parsing di \"%s\" nel file [%s]"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "esamino l'handler parallelo nel file [%s]"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "trovato handler parallelo per i nodi: %s"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "uso i supporti associati per il metodo parallelo: %s"
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "non riesco a utilizzare l'opzione parallel \"%s\" "
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -347,90 +286,90 @@ msgstr ""
 "--synthesis non può essere utilizzato con --media, -excludemedia, --"
 "sortmedia, --update o --parallel"
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "esamino il file synthesis [%s]"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "esamino il file hdlist [%s]"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "il supporto virtuale \"%s\" non è locale, sarà ignorato"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "problema nel leggere il file hdlist/synthesis del supporto \"%s\""
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "passo alla fase successiva per valutare le dipendenze\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "salto il pacchetto %s"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "installerebbe il pacchetto %s invece di aggiornarlo "
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "non riesco ad aprire il database rpm"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "il supporto \"%s\" esiste già"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr "il supporto virtuale deve essere locale"
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "supporto %s aggiunto"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "non riesco ad accedere al primo supporto di installazione"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "copio i file hdlist..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "...copia fallita"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "...copia terminata"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
@@ -439,43 +378,49 @@ msgstr ""
 "non riesco ad accedere al primo supporto di installazione (non trovo il file "
 "Mandrake/base/hdlist)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "recupero i file hdlist..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "...recupero terminato"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...recupero fallito: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "descrizione hdlist non valida \"%s\" nei file di hdlist"
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "tentativo di selezionare un supporto inesistente \"%s\""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "sto selezionando più supporti: %s"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "rimuovo il supporto \"%s\""
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -486,7 +431,7 @@ msgstr ""
 "questo pu succedere se avete montato manualmente la directory durante la "
 "creazione del supporto"
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -495,222 +440,222 @@ msgstr ""
 "il supporto virtuale \"%s\" dovrebbe avere un percorso valido per hdlist o "
 "synthesis, supporto ignorato."
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "copio il file di descrizione di \"%s\"..."
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "calcolo md5sum del file hdlist (o synthesis)"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "esamino il file MD5SUM"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "copio il file hdlist (o synthesis) di \"%s\"..."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "copia di [%s] fallita (il file è stranamente piccolo)"
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "controllo md5sum del file hdlist (o synthesis) copiato"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "copia di [%s] fallita (md5sum non corretta)"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "problema nel leggere il file synthesis del supporto \"%s\""
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "sto leggendo i file rpm da [%s]"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "non riesco a leggere i file rpm da [%s]: %s"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "nessun file rpm trovato da [%s]"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "recupero il file hdlist (o synthesis) di \"%s\"..."
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "ho trovato la hdlist (o synthesis) analizzata come %s..."
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "calcolo md5sum del file hdlist (or synthesis) scaricato"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr "md5sum errata"
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "recupero del file hdlist (o synthesis) fallito"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "non trovo il file hdlist per il supporto \"%s\""
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "file [%s] gi�in uso nello stesso supporto \"%s\""
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "non riesco ad analizzare l'hdlist file di \"%s\""
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "non riesco a scrivere il list file di \"%s\""
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "scrivo la lista di file per il supporto \"%s\""
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "non è stato scritto nulla nel list file per \"%s\""
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "controllo il file pubkey di \"%s\"..."
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...importata la chiave %s dal file pubkey di \"%s\""
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "non riesco ad importare il file pubkey di \"%s\""
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "sto leggendo le intestazioni dal supporto \"%s\""
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "sto costruendo il file hdlist [%s]"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "ho costruito il file hdlist (o synthesis) per il supporto \"%s\""
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "%d intestazioni trovate in cache"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "sto rimuovendo %d intestazioni obsolete in cache"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "sto montando %s"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "sto smontando %s"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "%s entry riposizionate nella deplist"
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "nessuna entry riallocata nella depslist"
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "nome del file rpm non valido [%s]"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "recupero il file rpm [%s] ..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "non riesco ad accedere al file rpm [%s]"
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "impossibile registrare il file rpm"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "errore durante la registrazione dei pacchetti locali"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "nessun pacchettto denominato %s"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "I seguenti pacchetti contengono %s: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "ci sono diversi pacchetti rpm con lo stesso nome di file \"%s\""
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "non riesco ad analizzare correttamente [%s] per il valore \"%s\""
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -720,62 +665,62 @@ msgstr ""
 "  probabilmente il mirror non è aggiornato, prova a usare un metodo "
 "alternativo."
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "il supporto \"%s\" non specifica una posizione per i file RPM"
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "il pacchetto %s non è stato trovato"
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "database urpmi bloccato"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "il supporto \"%s\" non è selezionato"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "non riesco a leggere il file rpm [%s] dal supporto \"%s\""
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "supporto incoerente \"%s\", segnato come removibile ma non tale"
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "non riesco ad accedere al supporto \"%s\""
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "input malformato: [%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "recupero i file rpm dal supporto \"%s\""
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "In preparazione..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "uso il processo %d per effettuare la transazione"
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -783,82 +728,97 @@ msgstr ""
 "creata transazione per installare su %s (rimuovi=%d, installa=%d, aggiorna=%"
 "d)"
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr "non riesco a creare la transazione"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "rimozione del pacchetto %s"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "impossibile rimuovere il pacchetto %s"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "aggiunta del pacchetto %s (id=%d, eid=%d, update=%d, file=%s)"
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "impossibile installare il pacchetto %s"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "perchè manca %s"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "perchè non è soddisfatto %s"
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr "sto selezionando %s"
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr "per tenere %s"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "per installare %s"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "per conflitti con %s"
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr "non richiesto"
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Firma non valida (%s)"
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "Key ID (%s) non valida"
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Firma mancante (%s)"
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "errata dichiarazione di proxy usando la linea di comando\n"
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: non posso leggere il file rpm \"%s\"\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Spiacente, scelta errata, prova di nuovo\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -875,19 +835,19 @@ msgstr ""
 "\n"
 "uso:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - stampa questo messaggio di aiuto.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 "  --auto         - include automaticamente un pacchetto nelle scelte.\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
@@ -895,7 +855,7 @@ msgstr ""
 "  --test         - verifica che l'installazione possa avvenire "
 "correttamente.\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
@@ -903,19 +863,19 @@ msgstr ""
 "  --force        - forza l'esecuzione anche se alcuni pacchetti non "
 "esistono.\n"
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - urpmi distribuito fra varie macchine.\n"
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr ""
 "  --root         - cambia la directory di root per installare i file rpm "
 "\"chrooted\".\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -926,75 +886,65 @@ msgstr ""
 "                   per (dis)installare un pacchetto chroot con l'opzione --"
 "root.\n"
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - modalità prolissa.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 "  -a             - seleziona tutti i pacchetti che soddisfano "
 "l'espressione.\n"
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: opzione sconosciuta \"-%s\", controllane l'uso con --help\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr "pacchetti sconosciuti"
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "pacchetto sconosciuto"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "la rimozione del pacchetto %s comprometterà il sistema"
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr "Niente da rimuovere"
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "Controllo la rimozione dei seguenti pacchetti:"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
 "Per soddisfare le dipendenze, saranno rimossi i seguenti pacchetti (%d MB)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (s/N) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "rimozione di %s"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr "Rimozione fallita"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Spiacente, scelta errata, prova di nuovo\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1011,23 +961,23 @@ msgstr ""
 "\n"
 "uso:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "--update       - usa solo supporti di aggiornamento.\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 "  --media        - usa solo i supporti nella lista, separati da virgole.\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - non usa i supporti elencati, separati da virgole.\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1035,18 +985,18 @@ msgstr ""
 "  --sortmedia    - ordina i supporti in base alle sottostringhe separate da "
 "virgole\n"
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - utilizza la synthesis specificata invece del db urpmi.\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - modalità prolissa.\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1057,103 +1007,103 @@ msgstr ""
 "                    usato il tag nella riga di comando, incompatibile \n"
 "                    con la modalità interattiva).\n"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --uniq         - non stampa le linee uguali.\n"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all           - stampa tutti i tag.\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr ""
 "  --group         - stampa il tag group: gruppo al quale appartiene il "
 "pacchetto.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size          - stampa la tag size: dimensione del pacchetto.\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --epoch          - stampa il tag epoch: epoca di compilazione.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary      - stampa il tag summary: sommario del pacchetto.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr ""
 "  --description   - stampa il tag description: descrizione del pacchetto.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr ""
 "  --sourcerpm    - stampa il tag sourcerpm: pacchetti rpm con sorgenti.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr "  --packager     - mostra il tag packager: curatore del pacchetto.\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr ""
 "  --buildhost    - mostra il tag buildhost: host sul quale è stato compilato "
 "il pacchetto.\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr ""
 "  --url          - stampa il tag url: url di riferimento del pacchetto.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr ""
 "  --provides      - stampa il tag provides: elementi forniti dal pacchetto.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr ""
 "  --requires      - stampa il tag requires: tutti i requisiti necessari per "
 "installare il pacchetto.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr ""
 "  --files         - stampa il tag files: tutti i files presenti nel "
 "pacchetto.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr ""
 "  --conflicts     - stampa il tag conflicts: tutti i conflitti rilevati per "
 "il pacchetto.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr ""
 "  --obsoletes     - stampa il tag obsolete: tutto quello reso obsoleto dal "
 "pacchetto.\n"
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
@@ -1162,25 +1112,25 @@ msgstr ""
 "  --env          - usa un ambiente specifico (tipicamente un bug \n"
 "                   report).\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
 "  -i             - ignora la distinzione tra maiuscole/minuscole in "
 "qualsiasi pattern.\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - stampa versione, release e architettura con il nome.\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - include il codice perl direttamente come perl -e.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
@@ -1188,7 +1138,7 @@ msgstr ""
 "  -a             - operatore binario AND, vero se entrambe le espressioni "
 "sono vere.\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
@@ -1196,24 +1146,24 @@ msgstr ""
 "  -o             - operatore binario OR, vero se una delle espressioni è "
 "vera.\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - NOT unario, vero se l'espressione è falsa.\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
 "  (              - parentesi sinistra per aprire un gruppo di espressioni.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
 "  )              - parentesi destra per chiudere un gruppo di espressioni.\n"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
@@ -1222,12 +1172,12 @@ msgstr ""
 "il callback è:\n"
 "%s\n"
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "uso le variabili d'ambiente su %s\n"
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1244,13 +1194,13 @@ msgstr ""
 "\n"
 "uso:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - utilizza la synthesis specificata invece del db urpmi.\n"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
@@ -1258,7 +1208,7 @@ msgstr ""
 "  --auto-select  - seleziona automaticamente i pacchetti per aggiornare il "
 "sistema.\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
@@ -1267,7 +1217,7 @@ msgstr ""
 "  --no-uninstall - non chiedere mai di rimuovere un pacchetto, ferma "
 "l'installazione\n"
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1276,7 +1226,7 @@ msgstr ""
 "  --keep         - usa i pacchetti esistenti se possibile, rifiuta\n"
 "                   i pacchetti richiesti se sono da rimuovere.\n"
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1287,42 +1237,42 @@ msgstr ""
 "                   un pacchetto sta per essere installato o\n"
 "                   aggiornato, il valore predefinito è %d.\n"
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - per avere transazione più corte, il default è %d.\n"
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - impone una ricerca fuzzy (uguale a -y).\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 "  --src          - il prossimo pacchetto è un pacchetto sorgente (uguale a -"
 "s).\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 "  --install-src  - installa solo il pacchetto dei sorgenti (non i binari).\n"
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 "  --clean        - rimuove gli rpm dalla cache prima di fare qualsiasi altra "
 "cosa.\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - tieni in cache gli rpm inutilizzati.\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1331,7 +1281,7 @@ msgstr ""
 "  --allow-nodeps - permette di chiedere all'utente se desidera installare\n"
 "                   dei pacchetti senza controllare le dipendenze.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1340,7 +1290,7 @@ msgstr ""
 "  --allow-force  - permette di chiedere all'utente se desidera installare\n"
 "                   dei pacchetti senza controllare dipendenze e integrità.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1351,22 +1301,22 @@ msgstr ""
 "                       per installare un pacchetto chroot con l'opzione --"
 "root.\n"
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - usa wget per recuperare file remoti.\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - usa curl per recuperare i file remoti.\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - limita la velocit�del download.\n"
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1377,7 +1327,7 @@ msgstr ""
 "                     (--no-resume lo disabilita, di default è "
 "disabilitato).\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1386,7 +1336,7 @@ msgstr ""
 "  --proxy        - usa il proxy HTTP specificato, il numero di porta\n"
 "                    predefinito è1080 (formato: <proxyhost[:port]>).\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1395,7 +1345,7 @@ msgstr ""
 "  --proxy-user   - specifica utente e password da utilizzare per\n"
 "                   l'autenticazione col proxy (formato: <utente:password>).\n"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1404,12 +1354,12 @@ msgstr ""
 "  --bug          - produce un bug report nella directory indicata con\n"
 "                   l'argomento successivo.\n"
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - usa l'interfaccia X.\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1418,7 +1368,7 @@ msgstr ""
 "  --best-output  - sceglie l'interfaccia migliore a seconda dell'ambiente:\n"
 "                   X o modalità testuale.\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1427,78 +1377,67 @@ msgstr ""
 "  --verify-rpm   - verifica la firma RPM prima dell'installazione\n"
 "                   (--no-verify la disabilita, abilitata di default).\n"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - percorsi da escludere, separati da virgole.\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - esclude i file di documentazione.\n"
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 "  -a             - seleziona tutte le corrispondenze da riga di comando.\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - abilita la ricerca tra i provides del pacchetto.\n"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 "  -P             - non cercare tra i provides per trovare il pacchetto.\n"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - impone una ricerca fuzzy (uguale a --fuzzy).\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 "  -s             - il prossimo pacchetto è un pacchetto sorgente (uguale a --"
 "src).\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - modalità silenziosa.\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  i nomi o file rpm passati da riga di comando verranno installati.\n"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr "Scegliere dove salvare i file"
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "errata dichiarazione di proxy usando la linea di comando\n"
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: opzione sconosciuta \"-%s\", controlla l'uso con --help\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 "Cosa pu essere fatto con i file binari rpm quando viene usato --install-src"
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1520,22 +1459,22 @@ msgstr ""
 "\n"
 "Cosa volete fare?"
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "Annulla"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr "Installa"
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr "Salva il file"
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1551,12 +1490,12 @@ msgstr ""
 "\n"
 "Potreste preferire salvarlo. >>Qual'è la vostra scelta? "
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, c-format
 msgid "Install it"
 msgstr "Installa"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1565,42 +1504,42 @@ msgstr ""
 "La directory [%s] esiste già usate un'altra directory per i bug report o "
 "cancellatela"
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Impossibile creare una directory [%s] per un bug report"
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Solo superuser è abilitato ad installare pacchetti"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "Per installare %s è richiesto uno dei seguenti pacchetti:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "E' richiesto uno dei seguenti pacchetti:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Qual'è la tua scelta? (1-%d) "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "Installazione dei pacchetti..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "Inizializzazione..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1609,12 +1548,12 @@ msgstr ""
 "Alcuni dei pacchetti richiesti non possono essere installati:\n"
 "%s"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr "confermi?"
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1625,7 +1564,7 @@ msgstr ""
 "devono essere rimossi per poterne aggiornare altri:\n"
 "%s\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1634,15 +1573,15 @@ msgstr ""
 "I pacchetti elencati devono essere rimossi per poterne aggiornare altri:\n"
 "%s"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
 "Per soddisfare le dipendenze, saranno installati i seguenti pacchetti (%d MB)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1651,38 +1590,48 @@ msgstr ""
 "Dovete essere root per installare le seguenti dipendenze:\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "non riesco a recuperare il pacchetto sorgente, interrompo"
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
 "Per favore inserisci il supporto denominato \"%s\" nel dispositivo [%s]"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Premi Invio quando sei pronto..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Download del pacchetto `%s'..."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% di %s completati, ETA = %s, velocità= %s"
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% completati, velocità= %s"
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "I seguenti pacchetti hanno delle firme errate"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Vuoi proseguire con l'installazione?"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1693,57 +1642,57 @@ msgstr ""
 "%s\n"
 "Potresti voler aggiornare il tuo database di urpmi"
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "Installazione fallita"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr "distribuzione di %s"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr "installazione di %s"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Sto installando il pacchetto `%s' (%s/%s)..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Provo l'installazione senza controllare le dipendenze? (s/N) "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Provo l'installazione in modo ancora più forzato (--force)? (s/N) "
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d transazioni dell'installazione fallite"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "L'installazione è possibile"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "E' già tutto installato"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr "Riavvio urpmi"
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1768,29 +1717,29 @@ msgstr ""
 "\n"
 "e le [opzioni] una combinazione di\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - crea un supporto di aggiornamento.\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr "  --probe-synthesis - cerca e usa il file synthesis.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr "  --probe-hdlist - prova ad usare un altro file hdlist.\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
 "                   hdlist file.\n"
 msgstr "  --no-probe     - non cerca nessun file synthesis o hdlist.\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -1799,7 +1748,7 @@ msgstr ""
 "  --distrib      - crea automaticamente tutti i supporti da quelli di\n"
 "                   installazione.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1811,7 +1760,7 @@ msgstr ""
 "o\n"
 "                   qualsiasi altra cosa configurata ;-)\n"
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1820,7 +1769,7 @@ msgstr ""
 "  --from         - usa l'url specificata per ottenere la lista dei mirror, \n"
 "                   quella predefinita è%s\n"
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1831,7 +1780,7 @@ msgstr ""
 "                   viene usata quella installata con la versione corrente\n"
 "                   Mandrake Linux.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
@@ -1841,7 +1790,7 @@ msgstr ""
 "                   l'architettura della versione di Mandrake Linux "
 "installata.\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
@@ -1850,74 +1799,53 @@ msgstr ""
 "  --virtual      - crea supporti virtuali che sono sempre aggiornati,\n"
 "                   è permesso soltanto il protocollo file://.\n"
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - disabilita il controllo MD5SUM sui file.\n"
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 "  -c             - ripulisci le intestazioni dalle directory in cache.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - forza la generazione dei file hdlist.\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"opzioni sconosciute '%s'\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "non posso aggiungere gli aggiornamenti della distribuzione cooker\n"
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "recupero i mirror presso %s..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"non c'è bisogno di fornire <percorso relativo di hdlist> con --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "non c'è bisogno di fornire <percorso relativo di hdlist> con --distrib"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "non riesco ad aggiornare il supporto \"%s\"\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"manca <percorso relativo di hdlist>\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "manca <percorso relativo di hdlist>\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"`with` assente per il supporto in rete\n"
+msgid "`with' missing for network media\n"
+msgstr "`with` assente per il supporto in rete\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "non riesco a creare il supporto \"%s\"\n"
@@ -1936,6 +1864,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - seleziona tutti i supporti.\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"opzioni sconosciute '%s'\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1950,7 +1887,7 @@ msgstr ""
 "la voce da rimuovere non è presente\n"
 "(uno di %s)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1959,27 +1896,27 @@ msgstr ""
 "uso: urpmi.update [opzioni] <nome> ...\n"
 "dove <nome> è il nome del supporto da aggiornare.\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "--update       - usa solo supporti di aggiornamento.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr "  --force-key    - forza l'aggiornamento della chiave gpg.\n"
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - seleziona tutti i supporti non rimovibili.\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "niente da aggiornare (usa urpmi.addmedia per aggiungere un supporto)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1988,7 +1925,7 @@ msgstr ""
 "la voce da aggiornare non �presente\n"
 "(uno di %s)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -2005,22 +1942,22 @@ msgstr ""
 "\n"
 "uso:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - elenca i pacchetti disponibili.\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - elenca i supporti disponibili.\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url   - elenca i supporti disponibili e la loro url.\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
@@ -2028,18 +1965,18 @@ msgstr ""
 "  --dump-config  - mostra la configurazione nella forma usata da urpmi."
 "addmedia\n"
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 "  --list-nodes   - elenca i nodi disponibili quando si utilizza --parallel.\n"
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - elenca gli alias paralleli disponibili.\n"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
@@ -2048,7 +1985,7 @@ msgstr ""
 "  --headers      - estrae le intestazioni per il pacchetto selezionato dal \n"
 "                   database di urpmi allo stdout (solo root).\n"
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
@@ -2056,7 +1993,7 @@ msgstr ""
 "  --sources      - elenca tutti i pacchetti sorgenti prima del download "
 "(solo root).\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
@@ -2065,17 +2002,17 @@ msgstr ""
 "  --use-distrib  - configura urpmi \"al volo\" da un albero distribuito.\n"
 "                   Permette di interrrogare una distribuzione.\n"
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - mostra la lista delle modifiche.\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - estende la ricerca alle dipendenze del pacchetto.\n"
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -2084,57 +2021,111 @@ msgstr ""
 "  -u             - rimuove il pacchetto se una versione più recente è "
 "giàinstallata.\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - risultati completi con i pacchetti da rimuovere.\n"
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - ricerca a ritroso sui requisiti del pacchetto.\n"
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -i             - stampa informazioni utili in forma leggibile.\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - stampa i gruppi anche col nome.\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - stampa versione e release anche col nome.\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l         - elenca i file presenti in un pacchetto.\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 "  i nomi o i file rpm passati da riga di comando vengono interrogati.\n"
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: opzione sconosciuta \"-%s\", controlla l'uso con --help\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: non posso leggere il file rpm \"%s\"\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes pu essere usato solo con --parallel"
 
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "Webfetch sconosciuto `%s' !!!\n"
+
+#~ msgid "copy failed: %s"
+#~ msgstr "copia fallita: %s"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "wget non è presente \n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "wget fallito: terminato con %d o segnale %d\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "curl non è presente\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "curl fallito: terminato con %d o segnale %d\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "rsync non è presente\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "rsync fallito: terminato con %d o segnale %d\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "ssh non è presente\n"
+
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpme: opzione sconosciuta \"-%s\", controllane l'uso con --help\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmq: opzione sconosciuta \"-%s\", controlla l'uso con --help\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr ""
+#~ "Per soddisfare le dipendenze, saranno installati i seguenti pacchetti (%d "
+#~ "MB)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "non c'è bisogno di fornire <percorso relativo di hdlist> con --distrib"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "manca <percorso relativo di hdlist>\n"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "`with` assente per il supporto in rete\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmq: opzione sconosciuta \"-%s\", controlla l'uso con --help\n"
+
 #~ msgid "no webfetch (curl or wget currently) found\n"
 #~ msgstr "programmi di webfetch (attualmente curl o wget) non trovati\n"
 
diff --git a/po/ja.po b/po/ja.po
index 58057bb3..666810f0 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2003-11-19 14:43+0100\n"
 "Last-Translator: UTUMI Hirosi <utuhiro@mx12.freecom.ne.jp>\n"
 "Language-Team: Japanese\n"
@@ -49,23 +49,23 @@ msgid ""
 "You requested installation of package %s\n"
 msgstr "指定されたパッケージ(%s)をインストールしています..\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "よろしいですか？"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "キャンセル"
 
 # ｙ
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n)[デフォルトはY] "
@@ -75,161 +75,100 @@ msgstr " (Y/n)[デフォルトはY] "
 msgid "%s: command not found\n"
 msgstr "%s: コマンドが見つかりません\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "where [options] are from\n"
 msgstr ""
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - このヘルプを表示\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr ""
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, fuzzy, c-format
 msgid "                    defaults is %s.\n"
 msgstr "  --list         - 利用できるパッケージを表示\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "不明なwebfetch %s\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr ""
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "プロトコルを操作できません: %s"
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "コピー失敗: %s"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "wgetがありません\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wgetに失敗: exited with %d or signal %d\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "curlがありません\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curlに失敗: exited with %d or signal %d\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "rsyncがありません\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "rsyncに失敗: exited with %d or signal %d\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "sshがありません\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr ""
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr ""
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "検索に失敗: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "設定ファイルの%s行でsyntax error"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 "メディア %s はすでに使われたhdlistを使おうとしています。このメディアを無視し"
 "ます"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 "メディア %s はすでに使われたリストを使おうとしています。このメディアを無視し"
 "ます"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
 "medium"
 msgstr ""
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, fuzzy, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr "「%s」を作成することができませんでした\n"
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, fuzzy, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "アップデートを「%s」について行なうことができませんでした\n"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "%s のhdlistにアクセスできません。メディアを無視します"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "%s のリストにアクセスできません。メディアを無視します"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, fuzzy, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "「%s」を作成することができませんでした\n"
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, fuzzy, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -238,186 +177,186 @@ msgstr ""
 "メディア %s はすでに使われたhdlistを使おうとしています。このメディアを無視し"
 "ます"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, fuzzy, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr ""
 "メディア %s はすでに使われたリストを使おうとしています。このメディアを無視し"
 "ます"
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, fuzzy, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "アップデートを「%s」について行なうことができませんでした\n"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "%s のリストが見つかりません。メディアを無視します"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, fuzzy, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "アップデートを「%s」について行なうことができませんでした\n"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "\"%s\"のリストファイルを調べられません。無視します。"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "リムーバブルメディア %s にはマウントポイントが多すぎます"
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "リムーバブルデバイスを %s と認識します"
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr ""
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, fuzzy, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "「%s」を作成することができませんでした\n"
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "設定ファイル[%s]を作成できません"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "設定ファイル[%s]を作成"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, fuzzy, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "「%s」を作成することができませんでした\n"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, fuzzy, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "「%s」を作成することができませんでした\n"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, fuzzy, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "「%s」を作成することができませんでした\n"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr ""
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, fuzzy, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "アップデートを「%s」について行なうことができませんでした\n"
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
 "update or --parallel"
 msgstr ""
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "synthesisファイル[%s]を調査"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "hdlistファイル[%s]を調査"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, fuzzy, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr ""
 "メディア %s はすでに使われたリストを使おうとしています。このメディアを無視し"
 "ます"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "メディア\"%s\"のhdlist/synthesisファイルを読み込み中に問題が発生"
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr ""
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "パッケージ %s をスキップ"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, fuzzy, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "%s を削除できません"
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "rpmdbを開けません"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "メディア %s は既に存在しています"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr ""
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "メディア %s を追加"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "最初のインストール用メディアにアクセスできません"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "hdlistファイルをコピー中.."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "..コピー失敗"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "..コピー完了"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
@@ -426,43 +365,49 @@ msgstr ""
 "最初のインストール用メディアにアクセスできません(Mandrake/base/hdlists があり"
 "ません)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, fuzzy, c-format
 msgid "retrieving hdlists file..."
 msgstr "「%s」を作成することができませんでした\n"
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "..検索完了"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "検索に失敗: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "hdlistファイルの説明 %s は無効です"
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "\"%s\" というメディアは存在しません"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "複数の種類のメディアを選択: %s"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "「%s」"
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "メディア %s を削除"
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -470,7 +415,7 @@ msgid ""
 "medium."
 msgstr ""
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, fuzzy, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -479,222 +424,222 @@ msgstr ""
 "メディア %s はすでに使われたhdlistを使おうとしています。このメディアを無視し"
 "ます"
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "%s の説明ファイルをコピー中.."
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "既存のhdlist/synthesisのmd5sumを計算"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "MD5SUMファイルを検査"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "%s のhdlist(またはsynthesis)をコピー中.."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "コピーしたhdlist/synthesisのmd5sumを計算"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, fuzzy, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "[%s]のコピーに失敗"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "メディア %s のsynthesisファイルを読み込み中に問題が発生"
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "[%s] からRPMファイルを読み込む"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "[%s] からRPMファイルを読み込むことができません: %s"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "%s にはRPMファイルがありません"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, fuzzy, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "「%s」を作成することができませんでした\n"
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, fuzzy, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "「%s」を作成することができませんでした\n"
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "%s のhdlist(またはsynthesis)をコピー中.."
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr "md5sumが合いません"
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "メディア %s にはhdlistファイルがありません"
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "ファイル [%s] は同じメディア %s で既に使われています"
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, fuzzy, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "アップデートを「%s」について行なうことができませんでした\n"
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "%s のリストファイルを作成できません"
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "メディア %s のリストファイルを作成"
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, fuzzy, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "「%s」を作成することができませんでした\n"
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, fuzzy, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "「%s」を作成することができませんでした\n"
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, fuzzy, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "%s のリストファイルを作成できません"
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, fuzzy, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "%s のリストファイルを作成できません"
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "メディア %s のヘッダを読み込み"
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "hdlist[%s]を作成"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "メディア %s のhdlist synthesisファイルを作成"
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "%d のヘッダをキャッシュから検出"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "%s をマウント"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "%s をアンマウント"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr ""
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "[%s]は無効なRPMファイル名です"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "RPMファイル[%s]を検索中.."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "RPMファイル[%s]にアクセスできません"
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "RPMファイルを登録できません"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "ローカルパッケージを登録中にエラーが発生"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "%s というパッケージはありません"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "%s には以下のようなものがあります: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "%s という名のRPMファイルは複数あります"
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, fuzzy, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "「%s」を作成することができませんでした\n"
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, fuzzy, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -703,144 +648,159 @@ msgstr ""
 "メディア %s は無効なリストファイルを含んでいます(おそらく更新されていません。"
 "別の方法を試してください)。"
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "メディア %s にはRPMファイルの所在が定義されていません"
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "パッケージ %s は見つかりません"
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmiのデータベースがロックされています"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "メディア %s は選択されていません"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "RPMファイル[%s]をメディア[%s]から読むことができません"
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "メディア %s はリムーバブルだと判断しましたが、不確実です"
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "メディア %s にアクセスできません"
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "不正な入力: [%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "メディア %s からRPMファイルを検索中.."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "準備.."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr ""
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, fuzzy, c-format
 msgid "unable to create transaction"
 msgstr "「%s」を作成することができませんでした\n"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "%s を削除"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "%s を削除できません"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr ""
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "%s をインストールできません"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "%s がない"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "依存を満たす %s がない"
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, fuzzy, c-format
 msgid "trying to promote %s"
 msgstr "削除するものはありません"
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, fuzzy, c-format
 msgid "in order to keep %s"
 msgstr ""
 "ローカルパッケージのインストールはスーパーユーザーでなくてはできません。"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "%s をインストールするには"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr ""
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr ""
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "無効な署名(%s)"
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr ""
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr ""
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr ""
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: RPMファイル(%s)を読むことが出来ませんでした\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "有効な選択ではありません。もう一度お願いします\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -856,115 +816,103 @@ msgstr ""
 "\n"
 "使いかた:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - このヘルプを表示\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - 自動的にパッケージを選択\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr "  --test         - インストールが正しく行われるか確かめる\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - 依存を無視して強制する\n"
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr ""
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - 詳細モード。\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpme:68
-#, fuzzy, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-"未知のオプション(\"-$1\")です。\n"
-"使いかたを --help オプションで確認してください。\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, fuzzy, c-format
 msgid "unknown packages"
 msgstr "%s というパッケージはありません\n"
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "不明なパッケージ"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "%s を削除するとシステムが壊れます"
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr "削除するものはありません"
 
-#: ../urpme:107
+#: ../urpme:99
 #, fuzzy, c-format
 msgid "Checking to remove the following packages"
 msgstr "次のパッケージのいずれかが必要です:"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr "依存を満たすために以下のパッケージを削除します(%d MB)"
 
 # ｙ
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (y/N)[デフォルトはN] "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "%s を削除"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr "削除失敗"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "有効な選択ではありません。もう一度お願いします\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -980,38 +928,38 @@ msgstr ""
 "\n"
 "使いかた:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - 更新したメディアのみを使う\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - 指定したメディアのみを使う(コンマで区切る)\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - 指定したメディアは使わない(コンマで区切る)\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr ""
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1019,149 +967,149 @@ msgid ""
 "                   line, incompatible with interactive mode).\n"
 msgstr ""
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr ""
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr ""
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr ""
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr ""
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr ""
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr ""
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr ""
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr ""
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr ""
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr ""
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr ""
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr ""
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr ""
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr ""
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr ""
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
 msgstr ""
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - 名前, バージョン, リリース番号, アーキテクチャを表示\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
 "%s\n"
 msgstr ""
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1177,19 +1125,19 @@ msgstr ""
 "\n"
 "使いかた:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - urpmiのデータベースではなく指定したsynthesisを使う\n"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - 自動的にパッケージを選択して更新\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
@@ -1197,14 +1145,14 @@ msgid ""
 msgstr ""
 "  --no-uninstall - パッケージを削除する必要があるときはインストール中止\n"
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that leads to remove.\n"
 msgstr "  --keep         - 既存のパッケージを維持し、削除要求は拒否する\n"
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1213,187 +1161,176 @@ msgid ""
 msgstr ""
 "  --split-level  - 一定数以上を更新するときは分割して行う。デフォルトは %d\n"
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - ファジー検索(-yと同じ)\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - ソースパッケージを指定(-s と同じ)\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - ソースのみをインストール(バイナリなし)\n"
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - 処理前にキャッシュからrpmを削除\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - 使われないrpmをキャッシュに保持\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
 msgstr "  --allow-nodeps - 依存性を確認せずにインストール\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
 msgstr "  --allow-force  - パッケージの完全性と依存性を確認しない\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - ダウンロード速度を制限\n"
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, fuzzy, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
 msgstr "  --verify-rpm   - rpmを照合(=デフォルト。--no-verify-rpm で無効)\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
 msgstr ""
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
 msgstr "  --bug          - 指定したディレクトリにバグレポートを出力\n"
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - Xインタフェースを使う\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
 "                   X or text mode.\n"
 msgstr "  --best-output  - X/テキストのうち最適なインタフェースを使う\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr "  --verify-rpm   - rpmを照合(=デフォルト。--no-verify-rpm で無効)\n"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - 除外するパスを指定\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr ""
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - ファジー検索(--fuzzyと同じ)\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s             - ソースパッケージを指定(--src と同じ)\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 "  コマンドラインで指定したパッケージ名/rpmファイルをインストールします\n"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr ""
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr ""
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: 不明なオプション \"-%s\"。--help を確認してください\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1406,22 +1343,22 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "なにもしない"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr ""
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr ""
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1431,55 +1368,55 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, fuzzy, c-format
 msgid "Install it"
 msgstr "インストールに失敗しました"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr ""
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr ""
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, fuzzy, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr ""
 "ローカルパッケージのインストールはスーパーユーザーでなくてはできません。"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "%s をインストールするには次のパッケージのいずれかが必要です:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "次のパッケージのいずれかが必要です:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "どれを選びますか？(1-%d) "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "パッケージをインストール.."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "初期化中.."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1488,12 +1425,12 @@ msgstr ""
 "インストールできないパッケージがあります:\n"
 "%s"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr ""
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1504,7 +1441,7 @@ msgstr ""
 "削除しなければなりません:\n"
 "%s\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1513,51 +1450,61 @@ msgstr ""
 "更新するには以下のパッケージを削除します:\n"
 "%s"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr "依存を満たすために以下のパッケージをインストールします(%d MB)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
 "%s\n"
 msgstr ""
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "ソースパッケージを取得できませんでした。このまま終了します"
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "メディア(%s)を %s に挿入して下さい。"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "準備ができましたらEnterを押してください"
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "パッケージ `%s'をダウンロード.."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr ""
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr ""
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "以下のパッケージは署名が間違っています"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "インストールを続けますか？"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1565,57 +1512,57 @@ msgid ""
 "You may want to update your urpmi database"
 msgstr ""
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "インストールに失敗しました"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, fuzzy, c-format
 msgid "distributing %s"
 msgstr "%s をインストール中…\n"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr "%s をインストール"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "パッケージ `%s'(%s/%s)をインストール中"
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "依存を確認せずにインストールしますか？ (y/N)[デフォルトはN] "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "再度インストールを試みますか？(--force) (y/N)[デフォルトはN]"
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d インストールに失敗"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "インストールは可能です"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "すべて既にインストールされています"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr ""
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1639,36 +1586,36 @@ msgstr ""
 "\n"
 "[オプション]は以下を選択\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr "  --probe-synthesis - 既存のsynthesisファイルを使わない\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr "  --probe-hdlist - 既存のhdlistファイルを使わない\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
 "                   hdlist file.\n"
 msgstr "  --no-probe     - 既存のsynthesis/hdlistファイルを使わない\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1676,14 +1623,14 @@ msgid ""
 "                   anything else that has been configured ;-)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr ""
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1691,87 +1638,66 @@ msgid ""
 "                   installed mandrake-release package.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
 "                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - ヘッダのキャッシュディレクトリを空にする\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - hdlistファイルの生成を強制\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"不明なオプション '%s'\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, fuzzy, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "「%s」を作成することができませんでした\n"
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"--distrib に <relative path of hdlist> は必要ありません"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "--distrib に <relative path of hdlist> は必要ありません"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "アップデートを「%s」について行なうことができませんでした\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"「<relative path of hdlist>」部分の指定がありません\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "「<relative path of hdlist>」部分の指定がありません\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, fuzzy, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"「with ...」以降の指定が ftp については必要です\n"
+msgid "`with' missing for network media\n"
+msgstr "「with ...」以降の指定が ftp については必要です\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "「%s」を作成することができませんでした\n"
@@ -1790,6 +1716,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - 全メディアを選択\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"不明なオプション '%s'\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1806,7 +1741,7 @@ msgstr ""
 "削除対象が見つかりません\n"
 "(%s の中のいずれか)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1815,29 +1750,29 @@ msgstr ""
 "使いかた: urpmi.update [オプション] <メディア名> ...\n"
 "<メディア名>は更新するメディア名\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - メディアを更新\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr ""
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "アップデートが必要なものはありません。\n"
 "メディアを追加する場合は urpmi.addmedia を使用して下さい。\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1846,7 +1781,7 @@ msgstr ""
 "アップデート対象が見つかりません\n"
 "(%s の中のいずれか)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1862,68 +1797,68 @@ msgstr ""
 "\n"
 "使いかた:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - 利用できるパッケージを表示\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - 利用できるメディアを表示\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, fuzzy, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-media   - 利用できるメディアを表示\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - list available parallel aliases.\n"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, fuzzy, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --help         - このヘルプを表示\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -1931,58 +1866,115 @@ msgid ""
 msgstr ""
 "  -u             - 新しい版がインストールされているときはパッケージを削除\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, fuzzy, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -i             - 読みやすい形で情報を表示\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - グループと名前を表示\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - 名前, バージョン, リリース番号を表示\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, fuzzy, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  --list         - 利用できるパッケージを表示\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "コマンドラインで指定したパッケージ名/rpmファイルがあるか調べます\n"
 
-#: ../urpmq:160
-#, fuzzy, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-"未知のオプション(\"-$1\")です。\n"
-"使いかたを --help オプションで確認してください。\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: RPMファイル(%s)を読むことが出来ませんでした\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr ""
 
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "不明なwebfetch %s\n"
+
+#~ msgid "copy failed: %s"
+#~ msgstr "コピー失敗: %s"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "wgetがありません\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "wgetに失敗: exited with %d or signal %d\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "curlがありません\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "curlに失敗: exited with %d or signal %d\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "rsyncがありません\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "rsyncに失敗: exited with %d or signal %d\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "sshがありません\n"
+
+#, fuzzy
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "未知のオプション(\"-$1\")です。\n"
+#~ "使いかたを --help オプションで確認してください。\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmi: 不明なオプション \"-%s\"。--help を確認してください\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr "依存を満たすために以下のパッケージをインストールします(%d MB)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "--distrib に <relative path of hdlist> は必要ありません"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "「<relative path of hdlist>」部分の指定がありません\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "「with ...」以降の指定が ftp については必要です\n"
+
+#, fuzzy
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "未知のオプション(\"-$1\")です。\n"
+#~ "使いかたを --help オプションで確認してください。\n"
+
 #~ msgid "urpmf version %s"
 #~ msgstr "urpmf バージョン %s"
 
diff --git a/po/ka.po b/po/ka.po
index cf405f36..98ee1a64 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2003-01-29 23:47+0400\n"
 "Last-Translator: Aiet Kolkhi <aiet@gmx.net>\n"
 "Language-Team: Georgian\n"
@@ -50,22 +50,22 @@ msgstr ""
 "პაკეტების ავტპმატური ინსტალაცია...\n"
 "თქვენ მოინდომეთ %s პაკეტის ინსტალირება\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "თანახმა ხართ?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "ო-ქეი"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "გამოქცევა"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (ხ/ა) [ხ] "
@@ -75,123 +75,62 @@ msgstr " (ხ/ა) [ხ] "
 msgid "%s: command not found\n"
 msgstr "%s: ბრძანება ვერ ვიპოვე\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "where [options] are from\n"
 msgstr ""
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr ""
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr ""
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, c-format
 msgid "                    defaults is %s.\n"
 msgstr ""
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "უცნობი ვებცდა `%s' !!!\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "%s-ისთვის უცნობი პროტოკოლია განსაზღვრული"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "ვერ ვუმკლავდები პროტოკოლს: %s"
 
-#: ../urpm.pm:189
-#, fuzzy, c-format
-msgid "copy failed: %s"
-msgstr "...კოპირება ჩაიშალა"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "wget აკლია\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget ჩაიშალა: დაიკეტა %d-თი ან სიგნალით %d\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "curl აკლია\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl ჩაიშალა: დაიკეტა %d-თი ან სიგნალით %d\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "rsync აკლია\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "rsync ჩაიშალა: დაიკეტა %d-თი ან სიგნალით %d\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "ssh აკლია\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr ""
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr ""
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...გამოძახება ჩაიშალა: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "სინტაქსური შეცდომა საკონფიგურაციო ფაილში. სტრიქონი: %s"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 "მედიუმი \"%s\" ცდილობს გამოიყენოს უკვე გამოყენებული hdlist. შედეგად უარი "
 "ეთქვა"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 "მედიუმი \"%s\" ცდილობს გამოიყენოს უკვე გამოყენებული list. შედეგად უარი ეთქვა"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -199,39 +138,39 @@ msgid ""
 msgstr ""
 "ვერ ვუმკლავდები მედიუმს \"%s\", ვინაიდან list ფაილს უკვე სხვა მედიუმი იყენებს"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 "ვერ გამოვიყენებ სახელს \"%s\" უსახელპო მედიასათვის, რადგან იგი უკვე "
 "გამოყენებულია"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr "ვერ ვითვალისწინებ მედიას \"%s\" რადგან list ფაილი [%s] არ არსებობს"
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "ვერ დავადგინე მედია ამ hdlist ფაილისთვის [%s]"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "ვერ ვუკავშირდები hdlist ფაილს \"%s\"-სთვის, მედიუმი იგნორირებულ იქნა"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "ვერ ვუკავშირდები list ფაილს \"%s\"-სთვის, მედიუმი იგნორირებულ იქნა"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "ვცდილობ გადავახტე არსებულ მედიას \"%s\"-ს, თავიდან ვიშორებ"
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, fuzzy, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -240,93 +179,93 @@ msgstr ""
 "მედიუმი \"%s\" ცდილობს გამოიყენოს უკვე გამოყენებული hdlist. შედეგად უარი "
 "ეთქვა"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, fuzzy, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr ""
 "მედიუმი \"%s\" ცდილობს გამოიყენოს უკვე გამოყენებული list. შედეგად უარი ეთქვა"
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "ვერ ვპოულობ hdlist ფაილს \"%s\"-სთვის, მედიუმი იგნორირებულ იქნა"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "ვერ ვპოულობ list ფაილს \"%s\"-სთვის, მედიუმი იგნორირებულ იქნა"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "არასწორი list ფაილის \"%s\"-სთვის, მედიუმი იგნორირებულ იქნა"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "ვერ ვამოწმებ list ფაილს \"%s\"-სთვის, მედიუმი იგნორირებულ იქნა"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "ძალიან ბევრი mount სახელი შეცვლადი  მედიუმისათვის \"%s\""
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "ვიღებ შეცვლად მოწყობილობას როგორც \"%s\""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "ვიყენებ სხვანაირ შეცვლად მოწყობილობას [%s] \"%s\"-სთვის"
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "ვერ ვიპოვე მდებარეობა შეცვლადი მედიუმისათვის \"%s\""
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "დაწერე საკონფიგურაციო ფაილი [%s]"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "ვერ ვშიფრავ \"%s\"-ს ფაილში [%s]"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "ვამოწმებ პარალელურ სათავეს ფაილში [%s]"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "ვიპოვე პარალელური სათაე (handler) nodes:-ისთვის %s"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "ვიყენებ მიმაგრებულ მედიას პარალელური რეჟიმისათვის: %s"
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "ვერ ვიყენებ პარალელურ პარამეტრს \"%s\""
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, fuzzy, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -335,93 +274,93 @@ msgstr ""
 "--synthesis პარამეტრი ვერ გამოიყენება --media, --update ან --parallel "
 "პარამეტრებთან ერთად"
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "ვამოწმებ synthesis ფაილს [%s]"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "ვამოწმებ hdlist ფაილს [%s]"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, fuzzy, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr ""
 "მედიუმი \"%s\" ცდილობს გამოიყენოს უკვე გამოყენებული list. შედეგად უარი ეთქვა"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, fuzzy, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr ""
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, fuzzy, c-format
 msgid "skipping package %s"
 msgstr "არც ერთ პაკეტს არ ქვია %s\n"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, fuzzy, c-format
 msgid "would install instead of upgrade package %s"
 msgstr ""
 "მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
 "ჩაწეროს პაკეტები."
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr ""
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "მედიუმი \"%s\" უკვე არსებობს"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr ""
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "დამატებული მედიუმი %s"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "ვერ ვიპოვე პირველი საინსტალაციო მედიუმი"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "hdlists ფაილის კოპირება..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, fuzzy, c-format
 msgid "...copying failed"
 msgstr "...კოპირება დასრულდა"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "...კოპირება დასრულდა"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
@@ -430,43 +369,49 @@ msgstr ""
 "ვერ ვპოულობ პირველ საინსტალაციო მედიუმს (ვერ მივაკვლიე Mandrake/base/hdlists "
 "ფაილს)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "ვიძახებ hdlists ფაილს..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "...გამოძახება დასრულდა"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...გამოძახება ჩაიშალა: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "არასწორი hdlist აღწერილობა \"%s\" hdlists-ის ფაილში"
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, fuzzy, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "ვცდილობ არარსებული მედიუმის ამორჩევას \"%s\""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "ვირჩევ მრავალ მედიას: %s"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "ვაგდებ მედიას \"%s\""
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -474,7 +419,7 @@ msgid ""
 "medium."
 msgstr ""
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, fuzzy, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -483,375 +428,390 @@ msgstr ""
 "მედიუმი \"%s\" ცდილობს გამოიყენოს უკვე გამოყენებული hdlist. შედეგად უარი "
 "ეთქვა"
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "\"%s\"-ის აღწერილობის ფაილის კოპირება..."
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, fuzzy, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "source hdlist-ის (ან synthesis-ის) კოპირება o"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, fuzzy, c-format
 msgid "examining MD5SUM file"
 msgstr "ვამოწმებ hdlist ფაილს [%s]"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, fuzzy, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "source hdlist-ის (ან synthesis-ის) კოპირება o"
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, fuzzy, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "source hdlist-ის (ან synthesis-ის) კოპირება o"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, fuzzy, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "...კოპირება ჩაიშალა"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, fuzzy, c-format
 msgid "reading rpm files from [%s]"
 msgstr "ვამოწმებ hdlist ფაილს [%s]"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, fuzzy, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr ""
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, fuzzy, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "source hdlist-ის (ან synthesis-ის) კოპირება o"
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, fuzzy, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "source hdlist-ის (ან synthesis-ის) კოპირება o"
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "source hdlist-ის (ან synthesis-ის) კოპირება o"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr ""
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, fuzzy, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "source hdlist-ის (ან synthesis-ის) კოპირება o"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, fuzzy, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "პრობლემა hdlist ფაილის ან მედიუმის კითხვისას \"%s\""
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, fuzzy, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "ვერ ვუკავშირდები hdlist ფაილს \"%s\"-სთვის, მედიუმი იგნორირებულ იქნა"
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, fuzzy, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, fuzzy, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "პრობლემა hdlist ფაილის ან მედიუმის კითხვისას \"%s\""
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, fuzzy, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "\"%s\"-ის აღწერილობის ფაილის კოპირება..."
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, fuzzy, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "\"%s\"-ის აღწერილობის ფაილის კოპირება..."
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, fuzzy, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, fuzzy, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, fuzzy, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "პრობლემა hdlist ფაილის ან მედიუმის კითხვისას \"%s\""
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, fuzzy, c-format
 msgid "building hdlist [%s]"
 msgstr "ვამოწმებ hdlist ფაილს [%s]"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, fuzzy, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr ""
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, fuzzy, c-format
 msgid "mounting %s"
 msgstr "ვაინსტალირებ: %s\n"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr ""
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr ""
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr ""
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, fuzzy, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "ვიძახებ hdlists ფაილს..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, fuzzy, c-format
 msgid "unable to register rpm file"
 msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr ""
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, fuzzy, c-format
 msgid "no package named %s"
 msgstr "არც ერთ პაკეტს არ ქვია %s\n"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, fuzzy, c-format
 msgid "The following packages contain %s: %s"
 msgstr "%s შედმეგ პაკეტებშია: %s\n"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, fuzzy, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "ვერ ვშიფრავ \"%s\"-ს ფაილში [%s]"
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
 "  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr ""
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr ""
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi მონაცემთა ბაზა ჩაკეტილია"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, fuzzy, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "მედიუმი \"%s\" უკვე არსებობს"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, fuzzy, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "ვერ ვუკავშირდები მედიას \"%s\""
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "ვერ ვუკავშირდები მედიას \"%s\""
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr ""
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, fuzzy, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "პრობლემა hdlist ფაილის ან მედიუმის კითხვისას \"%s\""
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr ""
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr ""
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, fuzzy, c-format
 msgid "unable to create transaction"
 msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, fuzzy, c-format
 msgid "removing package %s"
 msgstr ""
 "მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
 "ჩაწეროს პაკეტები."
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, fuzzy, c-format
 msgid "unable to remove package %s"
 msgstr ""
 "მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
 "ჩაწეროს პაკეტები."
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr ""
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, fuzzy, c-format
 msgid "unable to install package %s"
 msgstr ""
 "მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
 "ჩაწეროს პაკეტები."
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr ""
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr ""
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, fuzzy, c-format
 msgid "in order to keep %s"
 msgstr ""
 "მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
 "ჩაწეროს პაკეტები."
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, fuzzy, c-format
 msgid "in order to install %s"
 msgstr ""
 "მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
 "ჩაწეროს პაკეტები."
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr ""
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr ""
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr ""
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr ""
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr ""
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr ""
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr ""
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "ცუდი არჩევანია, კიდევ სცადეთ\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -862,114 +822,104 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr ""
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr ""
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-
-#: ../urpme:91
+#: ../urpme:83
 #, fuzzy, c-format
 msgid "unknown packages"
 msgstr "არც ერთ პაკეტს არ ქვია %s\n"
 
-#: ../urpme:91
+#: ../urpme:83
 #, fuzzy, c-format
 msgid "unknown package"
 msgstr "არც ერთ პაკეტს არ ქვია %s\n"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr ""
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr ""
 
-#: ../urpme:107
+#: ../urpme:99
 #, fuzzy, c-format
 msgid "Checking to remove the following packages"
 msgstr "ერთერთი შემდეგი პაკეტი საჭიროა:"
 
-#: ../urpme:114
+#: ../urpme:106
 #, fuzzy, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr "დამოკიდებულებების შესასრულებლად შემდეგი პაკეტები ჩაიწერება (%d მბ)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, fuzzy, c-format
 msgid " (y/N) "
 msgstr " (ხ/ა) [ხ] "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, fuzzy, c-format
 msgid "removing %s"
 msgstr ""
 "მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
 "ჩაწეროს პაკეტები."
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr ""
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "ცუდი არჩევანია, კიდევ სცადეთ\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -980,38 +930,38 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr ""
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1019,148 +969,148 @@ msgid ""
 "                   line, incompatible with interactive mode).\n"
 msgstr ""
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr ""
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr ""
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr ""
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr ""
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr ""
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr ""
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr ""
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr ""
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr ""
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr ""
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr ""
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr ""
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr ""
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr ""
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr ""
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
 msgstr ""
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
 "%s\n"
 msgstr ""
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1171,32 +1121,32 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr ""
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that leads to remove.\n"
 msgstr ""
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1204,186 +1154,175 @@ msgid ""
 "                   default is %d.\n"
 msgstr ""
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr ""
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
 msgstr ""
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
 msgstr ""
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
 "                   X or text mode.\n"
 msgstr ""
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr ""
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr ""
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr ""
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1396,22 +1335,22 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr ""
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr ""
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr ""
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1421,68 +1360,68 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, fuzzy, c-format
 msgid "Install it"
 msgstr "ინსტალაცია ჩაიშალა"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr ""
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr ""
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, fuzzy, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr ""
 "მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
 "ჩაწეროს პაკეტები."
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, fuzzy, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "ერთერთი შემდეგი პაკეტი საჭიროა:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "ერთერთი შემდეგი პაკეტი საჭიროა:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "თქვენი არჩევანი? (1-%d) "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr ""
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "მიმდინარეობს ინიციალიზაცია..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr ""
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1490,60 +1429,70 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
 msgstr "%s შედმეგ პაკეტებშია: %s\n"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr "დამოკიდებულებების შესასრულებლად შემდეგი პაკეტები ჩაიწერება (%d მბ)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
 "%s\n"
 msgstr ""
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "გთხოვთ ჩადოთ: %s სახელით: %s"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, fuzzy, c-format
 msgid "Press Enter when ready..."
 msgstr "გთხოვთ დაგვიდასტუროთ Enter ღილაკზე დაჭერით..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, fuzzy, c-format
 msgid "Downloading package `%s'..."
 msgstr ""
 "მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
 "ჩაწეროს პაკეტები."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr ""
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr ""
+
+#: ../urpmi:606
 #, fuzzy, c-format
 msgid "The following packages have bad signatures"
 msgstr "%s შედმეგ პაკეტებშია: %s\n"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr ""
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1551,57 +1500,57 @@ msgid ""
 "You may want to update your urpmi database"
 msgstr ""
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "ინსტალაცია ჩაიშალა"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, fuzzy, c-format
 msgid "distributing %s"
 msgstr "ვაინსტალირებ: %s\n"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, fuzzy, c-format
 msgid "installing %s"
 msgstr "ვაინსტალირებ: %s\n"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "პაკეტის ინსტალაცია: `%s' (%s/%s)..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "გნებავთ ვცადე ჩაწერა დამოკიდებულებების შემოწმების გარეშე? (ხ/ა) [ა] "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "გნებავთ ვცადო ჩაწერა ძალით (--force)? (ხ/ა) [ა] "
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "ინსტალაცია ჩაიშალა"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, fuzzy, c-format
 msgid "Installation is possible"
 msgstr "ინსტალაცია ჩაიშალა"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "უკვე ყველაფერი ჩაწერილია"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr ""
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1616,36 +1565,36 @@ msgid ""
 "and [options] are from\n"
 msgstr ""
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
 "                   hdlist file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1653,14 +1602,14 @@ msgid ""
 "                   anything else that has been configured ;-)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr ""
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1668,79 +1617,66 @@ msgid ""
 "                   installed mandrake-release package.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
 "                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, fuzzy, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "ვიძახებ hdlists ფაილს..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr ""
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr ""
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
+msgid "<relative path of hdlist> missing\n"
 msgstr ""
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
+msgid "`with' missing for network media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr ""
@@ -1757,6 +1693,13 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr ""
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1769,41 +1712,41 @@ msgid ""
 "(one of %s)\n"
 msgstr ""
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
 msgstr ""
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr ""
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr ""
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
 "(one of %s)\n"
 msgstr ""
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1814,123 +1757,146 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr ""
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr ""
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr ""
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr ""
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr ""
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr ""
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr ""
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr ""
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr ""
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: ../urpmq:160
+#: ../urpmq:147
 #, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgid "--list-nodes can only be used with --parallel"
 msgstr ""
 
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr ""
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "უცნობი ვებცდა `%s' !!!\n"
 
-#: ../urpmq:216
-#, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr ""
+#, fuzzy
+#~ msgid "copy failed: %s"
+#~ msgstr "...კოპირება ჩაიშალა"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "wget აკლია\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "wget ჩაიშალა: დაიკეტა %d-თი ან სიგნალით %d\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "curl აკლია\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "curl ჩაიშალა: დაიკეტა %d-თი ან სიგნალით %d\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "rsync აკლია\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "rsync ჩაიშალა: დაიკეტა %d-თი ან სიგნალით %d\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "ssh აკლია\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr "დამოკიდებულებების შესასრულებლად შემდეგი პაკეტები ჩაიწერება (%d მბ)"
 
 #~ msgid "no webfetch (curl or wget currently) found\n"
 #~ msgstr "ვერ ვიპოვე ვებცდა (webfetch), ანუ ამჟამად curl ან wget\n"
diff --git a/po/ko.po b/po/ko.po
index 82c4d634..401ff01e 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2001-09-22 03:14+0900\n"
 "Last-Translator: Jaegeum Choe <baedaron@hananet.net>\n"
 "Language-Team: Korean <baedaron@hananet.net>\n"
@@ -49,22 +49,22 @@ msgstr ""
 "팩키지 자동 설치...\n"
 "님은 팩키지 %s의 설치를 요청했습니다.\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "계속할까요?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "확인"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "취소"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) "
@@ -74,120 +74,59 @@ msgstr " (Y/n) "
 msgid "%s: command not found\n"
 msgstr "%s: 명령어를 찾을 수 없습니다.\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "where [options] are from\n"
 msgstr ""
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - 이 도움말 출력.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr ""
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, c-format
 msgid "                    defaults is %s.\n"
 msgstr ""
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr ""
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr ""
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, fuzzy, c-format
 msgid "unable to handle protocol: %s"
 msgstr "목록 파일을 생성할 수 없습니다: %s"
 
-#: ../urpm.pm:189
-#, fuzzy, c-format
-msgid "copy failed: %s"
-msgstr "설치 실패."
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr ""
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr ""
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr ""
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr ""
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr ""
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr ""
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr ""
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr ""
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr ""
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, fuzzy, c-format
-msgid "...retrieving failed: %s"
-msgstr "[%s] 추출 중"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "설정 파일의 %s 줄에 문법 오류"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, fuzzy, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr "매체 「%s」는 이미 사용 중인 목록파일을 사용하려 합니다. 매체 무시됨."
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, fuzzy, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr "매체 「%s」가 이미 사용되는 목록을 사용하려 합니다. 매체 무시됨."
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -196,263 +135,269 @@ msgstr ""
 "목록 파일이 다른 매체에 의해 이미 사용되고 있기 때문에, 매체 「%s」를 사용할 "
 "수 없습니다."
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr "매체 이름 「%s」을 사용할 수 없습니다. 벌써 사용 중입니다."
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 "목록 파일 [%2$s]가 존재하지 않기 때문에, 매체「%1$s」을 처리할 수 없습니다."
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "이 목록파일 [%s]의 매체를 결정할 수 없습니다."
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "「%s」의 목록 파일에 접근할 수 없습니다. 매체 무시됨."
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "「%s」의 목록 파일에 접근할 수 없습니다. 매체 무시됨."
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, fuzzy, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "존재하지 않는 매체「%s」 선택 시도"
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, fuzzy, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
 "ignored"
 msgstr "매체 「%s」는 이미 사용 중인 목록파일을 사용하려 합니다. 매체 무시됨."
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, fuzzy, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "매체 「%s」가 이미 사용되는 목록을 사용하려 합니다. 매체 무시됨."
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "「%s」에 대한 목록 파일을 찾을 수 없습니다. 매체 무시됨."
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "「%s」에 대한 목록 파일을 찾을 수 없습니다. 매체 무시됨."
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, fuzzy, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "「%s」에 대한 목록 파일을 찾을 수 없습니다. 매체 무시됨."
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, fuzzy, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "「%s」에 대한 목록 파일을 찾을 수 없습니다. 매체 무시됨."
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, fuzzy, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "「%s」매체를 생성할 수 없습니다.\n"
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr ""
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, fuzzy, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "「%s」매체를 생성할 수 없습니다.\n"
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "설정 파일 [%s]에 기록할 수 없습니다."
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "설정 파일 [%s]에 기록"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, fuzzy, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "RPM 파일「%s」에 접근할 수 없습니다."
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, fuzzy, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "목록 파일 [%s] 읽는 중"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, fuzzy, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "목록 파일 [%s] 읽는 중"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr ""
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, fuzzy, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "「%s」매체를 업데이트할 수 없습니다.\n"
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
 "update or --parallel"
 msgstr ""
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, fuzzy, c-format
 msgid "examining synthesis file [%s]"
 msgstr "의존목록 파일 [%s] 읽기"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, fuzzy, c-format
 msgid "examining hdlist file [%s]"
 msgstr "목록 파일 [%s] 읽는 중"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, fuzzy, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "매체 「%s」가 이미 사용되는 목록을 사용하려 합니다. 매체 무시됨."
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, fuzzy, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "매체「%s」에 대한 목록 합성 파일 생성 완료."
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr ""
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, fuzzy, c-format
 msgid "skipping package %s"
 msgstr "%s라는 팩키지는 없습니다."
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, fuzzy, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "루트 사용자만이 지역 팩키지를 설치할 수 있습니다."
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, fuzzy, c-format
 msgid "unable to open rpmdb"
 msgstr "RPM 파일을 등록할 수 없습니다."
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "매체「%s」는 이미 존재합니다."
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr ""
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, fuzzy, c-format
 msgid "added medium %s"
 msgstr "존재하지 않는 매체「%s」의 제거 시도"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, fuzzy, c-format
 msgid "unable to access first installation medium"
 msgstr "「%s」의 목록 파일에 접근할 수 없습니다. 매체 무시됨."
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, fuzzy, c-format
 msgid "copying hdlists file..."
 msgstr "목록 파일 [%s] 읽는 중"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, fuzzy, c-format
 msgid "...copying failed"
 msgstr "[%s] 추출 중"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, fuzzy, c-format
 msgid "...copying done"
 msgstr "[%s] 추출 중"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, fuzzy, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
 "found)"
 msgstr "「%s」의 목록 파일에 접근할 수 없습니다. 매체 무시됨."
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, fuzzy, c-format
 msgid "retrieving hdlists file..."
 msgstr "[%s] 추출 중"
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, fuzzy, c-format
 msgid "...retrieving done"
 msgstr "[%s] 추출 중"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, fuzzy, c-format
+msgid "...retrieving failed: %s"
+msgstr "[%s] 추출 중"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, fuzzy, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "존재하지 않는 매체「%s」 선택 시도"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, fuzzy, c-format
 msgid "selecting multiple media: %s"
 msgstr "존재하지 않는 매체「%s」 선택 시도"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr ""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, fuzzy, c-format
 msgid "removing medium \"%s\""
 msgstr "존재하지 않는 매체「%s」의 제거 시도"
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -460,372 +405,387 @@ msgid ""
 "medium."
 msgstr ""
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, fuzzy, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
 "ignored"
 msgstr "매체 「%s」는 이미 사용 중인 목록파일을 사용하려 합니다. 매체 무시됨."
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, fuzzy, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "목록 파일에「%s」에 대한 기록이 없습니다."
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, fuzzy, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "목록 파일에「%s」에 대한 기록이 없습니다."
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, fuzzy, c-format
 msgid "examining MD5SUM file"
 msgstr "목록 파일 [%s] 읽는 중"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, fuzzy, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "목록 파일에「%s」에 대한 기록이 없습니다."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, fuzzy, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "[%s]의 wget 실패 (wget이 설치되어 있습니까?)"
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, fuzzy, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "목록 파일에「%s」에 대한 기록이 없습니다."
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, fuzzy, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "[%s] 복사 실패."
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, fuzzy, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "매체「%s」에 대한 목록 합성 파일 생성 완료."
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, fuzzy, c-format
 msgid "reading rpm files from [%s]"
 msgstr "[%s]에서 RPM 파일을 찾을 수 없습니다."
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, fuzzy, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "매체「%2$s」에서 RPM 파일「%1$s」를 읽을 수 없습니다."
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "[%s]에서 RPM 파일을 찾을 수 없습니다."
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, fuzzy, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "[%s] 추출 중"
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, fuzzy, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "목록 파일에「%s」에 대한 기록이 없습니다."
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "목록 파일에「%s」에 대한 기록이 없습니다."
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr ""
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "매체「%s」에 대한 목록 파일을 찾을 수 없습니다."
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "「%s」의 목록파일을 분석할 수 없습니다."
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "「%s」의 목록 파일을 기록할 수 없습니다."
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, fuzzy, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "매체「%s」에 대한 목록 파일을 찾을 수 없습니다."
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "목록 파일에「%s」에 대한 기록이 없습니다."
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, fuzzy, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "[%s] 추출 중"
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, fuzzy, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "「%s」의 목록 파일을 기록할 수 없습니다."
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, fuzzy, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "「%s」의 목록 파일을 기록할 수 없습니다."
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, fuzzy, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "존재하지 않는 매체「%s」의 제거 시도"
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "목록 [%s] 생성 중"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "매체「%s」에 대한 목록 합성 파일 생성 완료."
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "캐쉬에서 %d 헤더를 찾았습니다."
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "캐쉬에서 %d 낡은 헤더 제거 중"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "%s 마운트 중"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "%s 마운트 해제 중"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "의존목록에서 %s 항목 위치 재지정"
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, fuzzy, c-format
 msgid "no entries relocated in depslist"
 msgstr "의존목록에서 %s 항목 위치 재지정"
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "유효하지 않은 RPM 파일 이름 [%s]"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, fuzzy, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "[%s] 추출 중"
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "RPM 파일「%s」에 접근할 수 없습니다."
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, fuzzy, c-format
 msgid "unable to register rpm file"
 msgstr "RPM 파일「%s」에 접근할 수 없습니다."
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "지역 팩키지 등록 오류"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "%s라는 팩키지는 없습니다."
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "다음 팩키지들은 %s를 담고 있습니다: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "동일한 파일 이름 「%s」를 가진 여러 개의 팩키지가 존재합니다."
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, fuzzy, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "매체「%2$s」에서 RPM 파일「%1$s」를 읽을 수 없습니다."
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
 "  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr ""
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "팩키지 %s를 찾을 수 없습니다."
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr ""
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "매체 [%s]는 선택되지 않았습니다."
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "매체「%2$s」에서 RPM 파일「%1$s」를 읽을 수 없습니다."
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "매체「%s」에 접근할 수 없습니다."
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "잘못된 형식의 입력: [%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, fuzzy, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "[%s] 추출 중"
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr ""
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr ""
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, fuzzy, c-format
 msgid "unable to create transaction"
 msgstr "「%s」매체를 생성할 수 없습니다.\n"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, fuzzy, c-format
 msgid "removing package %s"
 msgstr "루트 사용자만이 지역 팩키지를 설치할 수 있습니다."
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, fuzzy, c-format
 msgid "unable to remove package %s"
 msgstr "루트 사용자만이 지역 팩키지를 설치할 수 있습니다."
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr ""
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, fuzzy, c-format
 msgid "unable to install package %s"
 msgstr "루트 사용자만이 지역 팩키지를 설치할 수 있습니다."
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, fuzzy, c-format
 msgid "due to missing %s"
 msgstr "kdesu가 없음"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr ""
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr ""
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, fuzzy, c-format
 msgid "in order to install %s"
 msgstr "자동 설치 플로피 디스크 생성"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr ""
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr ""
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr ""
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr ""
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr ""
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr ""
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: RPM 파일 「%s」을 읽을 수 없습니다.\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "선택이 잘못되었습니다. 다시 시도하세요.\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -836,112 +796,102 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - 이 도움말 출력.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr ""
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - 상세 정보 모드.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpme:68
-#, fuzzy, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: 알 수 없는 옵션 「-%s」, 「--help」옵션으로 사용법을 보세요.\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, fuzzy, c-format
 msgid "unknown packages"
 msgstr "[%s] 팩키지를 열 수 없습니다.\n"
 
-#: ../urpme:91
+#: ../urpme:83
 #, fuzzy, c-format
 msgid "unknown package"
 msgstr "[%s] 팩키지를 열 수 없습니다.\n"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr ""
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr ""
 
-#: ../urpme:107
+#: ../urpme:99
 #, fuzzy, c-format
 msgid "Checking to remove the following packages"
 msgstr "다음 팩키지들 중 하나가 필요합니다:"
 
-#: ../urpme:114
+#: ../urpme:106
 #, fuzzy, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr "의존성을 총족시키기 위해, 다음 팩키지들도 설치될 것입니다. (%d MB)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, fuzzy, c-format
 msgid " (y/N) "
 msgstr " (Y/n) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, fuzzy, c-format
 msgid "removing %s"
 msgstr "%s 제거 중"
 
-#: ../urpme:123
+#: ../urpme:115
 #, fuzzy, c-format
 msgid "Removing failed"
 msgstr "[%s] 추출 중"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "선택이 잘못되었습니다. 다시 시도하세요.\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -952,38 +902,38 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr ""
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -991,148 +941,148 @@ msgid ""
 "                   line, incompatible with interactive mode).\n"
 msgstr ""
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr ""
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr ""
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr ""
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr ""
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr ""
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr ""
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr ""
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr ""
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr ""
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr ""
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr ""
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr ""
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr ""
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr ""
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr ""
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
 msgstr ""
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
 "%s\n"
 msgstr ""
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1143,32 +1093,32 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr ""
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that leads to remove.\n"
 msgstr ""
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1176,186 +1126,175 @@ msgid ""
 "                   default is %d.\n"
 msgstr ""
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr ""
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
 msgstr ""
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
 msgstr ""
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
 "                   X or text mode.\n"
 msgstr ""
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr ""
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr ""
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr ""
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: 알 수 없는 옵션 「-%s」, 「--help」옵션으로 사용법을 보세요.\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1368,22 +1307,22 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "그냥 둠"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr ""
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr ""
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1393,66 +1332,66 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, fuzzy, c-format
 msgid "Install it"
 msgstr "설치 실패."
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr ""
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr ""
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, fuzzy, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "루트 사용자만이 지역 팩키지를 설치할 수 있습니다."
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "다음 팩키지들 중 하나가 %s를 설치하는데 필요합니다:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "다음 팩키지들 중 하나가 필요합니다:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "어느 것을 선택하시겠습니까? (1-%d) "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, fuzzy, c-format
 msgid "Package installation..."
 msgstr "설치할 팩키지 준비 중..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "초기화..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr ""
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1462,7 +1401,7 @@ msgstr ""
 "업그레이드하기 위해서는 일부 팩키지가 제거되어야 합니다. 이 기능은 아직 지원"
 "되지 않습니다.\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1471,51 +1410,61 @@ msgstr ""
 "업그레이드하기 위해서는 일부 팩키지가 제거되어야 합니다. 이 기능은 아직 지원"
 "되지 않습니다.\n"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr "의존성을 총족시키기 위해, 다음 팩키지들도 설치될 것입니다. (%d MB)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
 "%s\n"
 msgstr ""
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "소스 팩키지를 구할 수 없습니다, 중단합니다."
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "장치 [%2$s]에 「%1$s」미디어를 넣으세요."
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, fuzzy, c-format
 msgid "Press Enter when ready..."
 msgstr "다 되었으면 ENTER키를 누르세요..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, fuzzy, c-format
 msgid "Downloading package `%s'..."
 msgstr "루트 사용자만이 지역 팩키지를 설치할 수 있습니다."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr ""
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr ""
+
+#: ../urpmi:606
 #, fuzzy, c-format
 msgid "The following packages have bad signatures"
 msgstr "다음 팩키지들은 %s를 담고 있습니다: %s"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr ""
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1523,57 +1472,57 @@ msgid ""
 "You may want to update your urpmi database"
 msgstr ""
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "설치 실패."
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, fuzzy, c-format
 msgid "distributing %s"
 msgstr "%s 설치 중...\n"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, fuzzy, c-format
 msgid "installing %s"
 msgstr "%s 설치 중...\n"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "팩키지 설치 중: [%s] (%s/%s)..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "의존성 검사없이 설치합니까? (y/N) "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "설치를 강제 추진합니까? (y/N) "
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "설치 실패."
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, fuzzy, c-format
 msgid "Installation is possible"
 msgstr "설치 실패."
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "모든 것이 이미 설치되어 있습니다."
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr ""
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, fuzzy, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1596,36 +1545,36 @@ msgstr ""
 "       http://<호스트>/<경로> with <팩키지 목록 파일의 상대경로>\n"
 "       removable_<장치>://<경로>\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
 "                   hdlist file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1633,14 +1582,14 @@ msgid ""
 "                   anything else that has been configured ;-)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr ""
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1648,85 +1597,66 @@ msgid ""
 "                   installed mandrake-release package.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
 "                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, fuzzy, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "[%s] 추출 중"
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, fuzzy, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"<팩키지 목록 파일의 상대경로>가 빠져 있습니다.\n"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "<팩키지 목록 파일의 상대경로>가 빠져 있습니다.\n"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "「%s」매체를 업데이트할 수 없습니다.\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"<팩키지 목록 파일의 상대경로>가 빠져 있습니다.\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<팩키지 목록 파일의 상대경로>가 빠져 있습니다.\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, fuzzy, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"FTP 미디어에 대해 「with」가 빠져있습니다.\n"
+msgid "`with' missing for network media\n"
+msgstr "FTP 미디어에 대해 「with」가 빠져있습니다.\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "「%s」매체를 생성할 수 없습니다.\n"
@@ -1748,6 +1678,13 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr ""
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1763,7 +1700,7 @@ msgstr ""
 "제거하려는 항목이 빠져있습니다.\n"
 "(%s 중 하나)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, fuzzy, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1775,29 +1712,29 @@ msgstr ""
 "\n"
 "알 수 없는 옵션 「%s」\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr ""
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr ""
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "업데이트할 것이 없습니다. (미디어를 추가하려면 「urpmi.addmedia」를 사용하세"
 "요.\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1806,7 +1743,7 @@ msgstr ""
 "업데이트하려는 항목이 빠져있습니다.\n"
 "(%s 중 하나)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1817,124 +1754,159 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr ""
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr ""
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr ""
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr ""
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr ""
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr ""
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr ""
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr ""
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr ""
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: 알 수 없는 옵션 「-%s」, 「--help」옵션으로 사용법을 보세요.\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: RPM 파일 「%s」을 읽을 수 없습니다.\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr ""
 
+#, fuzzy
+#~ msgid "copy failed: %s"
+#~ msgstr "설치 실패."
+
+#, fuzzy
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpmi: 알 수 없는 옵션 「-%s」, 「--help」옵션으로 사용법을 보세요.\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpmi: 알 수 없는 옵션 「-%s」, 「--help」옵션으로 사용법을 보세요.\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr "의존성을 총족시키기 위해, 다음 팩키지들도 설치될 것입니다. (%d MB)"
+
+#, fuzzy
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "<팩키지 목록 파일의 상대경로>가 빠져 있습니다.\n"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "<팩키지 목록 파일의 상대경로>가 빠져 있습니다.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "FTP 미디어에 대해 「with」가 빠져있습니다.\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpmq: 알 수 없는 옵션 「-%s」, 「--help」옵션으로 사용법을 보세요.\n"
+
 #~ msgid "urpmf version %s"
 #~ msgstr "urpmf 버전 %s"
 
diff --git a/po/ky.po b/po/ky.po
index d4ce5619..9813986f 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-ky\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2004-04-05 17:56+0600\n"
 "Last-Translator: Timur Jamakeev <ztimur@mail.ru>\n"
 "Language-Team: Kyrgyz\n"
@@ -48,22 +48,22 @@ msgstr ""
 "Пакеттерди автоматтык орнотуу...\n"
 "Сиз %s пакетин орнотууну талап кылдыңыз\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "Бул туурабы?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Калтыруу"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) "
@@ -73,7 +73,7 @@ msgstr " (Y/n) "
 msgid "%s: command not found\n"
 msgstr "%s: команда табылбады\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
@@ -82,117 +82,56 @@ msgstr ""
 "колдонулушу: %s [опциялар]\n"
 "[опциялар] мындай\n"
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - бул жардам кабарын чыгарат.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "   -g [group]     - жыйынтыгын берилген группа менен чектөө.\n"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, c-format
 msgid "                    defaults is %s.\n"
 msgstr "                    алдыалынганы %s.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Белгисиз webfetch `%s' !!!\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "%s үчүн белгисиз протокол берилген"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "webfetch табылбады, колдоого ээ webfetch: %s\n"
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "протокол аткарылбады: %s"
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "копиялоо ийгиликсиз: %s"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "wget табылбады\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget ийгиликсиз: %d же %d сигналы менен чыкты\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "curl табылбады\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl ийгиликсиз: %d же %d сигналы менен чыкты\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "rsync табылбады\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "rsync ийгиликсиз: %d же %d сигналы менен чыкты\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "ssh табылбады\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% / %s аткарылды, ETA = %s, ылдамдыгы = %s"
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% аткарылды, ылдамдыгы = %s"
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...кабыл алуу ийгиликсиз: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "конфиг файлдын %s-сабында синтаксистик ката"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 "\"%s\" булагы алдагачан колдонулуп жаткан hdlist алуу аракетинде, булак "
 "четке кагылды"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 "\"%s\" булагы алдагачан колдонулуп жаткан тизмени алуу аракетинде, булак "
 "четке кагылды"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -201,39 +140,39 @@ msgstr ""
 "\"%s\" булагын сактап калуу мүмкүн эмес, себеби файл тизмесин башка булак "
 "колдонууда"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 "\"%s\" атын, аты аталбаган булакка колдонуу мүмкүн эмес, себеби ал алдагачан "
 "колдонууда"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr "\"%s\" булагын көңүлгө алууга болбойт, себеи [%s] тизме файлы жок"
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "бул hdlist [%s] файлынын булагын аныктоо мүмкүн эмес"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "\"%s\" үчүн hdlist файлына жетүүгө болбоду, булак четке кагылды"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "\"%s\" үчүн тизме файлына жетүүгө болбоду, булак четке кагылды"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "\"%s\" бар булагынан аттап өтүү аракети, калтырылды"
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -242,94 +181,94 @@ msgstr ""
 "\"%s\" виртуалдык булагы hdlist же тизме файлын аныктабашы керек, булак "
 "четке кагылды"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr ""
 "\"%s\" виртуалдык булагынын url'и бош болушу керек, булак четке кагылды"
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "\"%s\" үчүн hdlist файлы табылбады, булак четке кагылды"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "\"%s\" үчүн тизме файлы табылбады, булак четке кагылды"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "\"%s\" үчүн тизме файлы байланышсыз, булак четке кагылды"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "\"%s\" үчүн тизме файлын текшерүүгө болбоду, булак четке кагылды"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr ""
 " \"%s\" чыгарылып алынуучу булагы үчүн бириктирүү чекиттери өтө эле көп "
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "чыгарылып алынуучу түзүлүш \"%s\" катары каралууда"
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "[%s] башка чыгарып алынуучу түзүлүш колдонулууда; \"%s\" үчүн"
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "\"%s\" чыгарып алынуучу булагынын жолун алуу мүмкүн эмес"
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "[%s] конфиг файлын жазуу мүмкүн эмес"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "[%s] конфиг файлын жазуу"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "Параллелдик режимди use-distrib режими менен чогуу колдонууга болбойт"
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "\"%s\" түшүнүүгө болбоду; ал [%s] файлынын ичинде"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "[%s] файлынын ичинде параллелдик аткаргыч текшерилүүдө"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "%s бутактары үчүн параллелдик аткаруучу табылды"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "параллелдик режим үчүн байланышкан булак колдонулууда: %s"
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "\"%s\" параллелдик опциясын колдонуу мүмкүн эмес"
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -338,133 +277,139 @@ msgstr ""
 "--synthesis төмөнкүлөр менен бирге --media, --excludemedia, --sortmedia, --"
 "update же --parallel менен колдонууга болбойт"
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "[%s] synthesis файлы текшерилүүдө"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "[%s] hdlist файлы текшерилүүдө"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "\"%s\" виртуалдык булагы локалдык эмес, булак четке кагылды"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "\"%s\" булагы үчүн hdlist же synthesis файлын окуу проблемасы"
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr ""
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr ""
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr ""
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr ""
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr ""
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr ""
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr ""
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr ""
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr ""
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr ""
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
 "found)"
 msgstr ""
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr ""
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr ""
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...кабыл алуу ийгиликсиз: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr ""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr ""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -472,372 +417,387 @@ msgid ""
 "medium."
 msgstr ""
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
 "ignored"
 msgstr ""
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr ""
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr ""
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr ""
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr ""
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr ""
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr ""
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr ""
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr ""
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr ""
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr ""
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr ""
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr ""
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr ""
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr ""
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr ""
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr ""
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr ""
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr ""
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr ""
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr ""
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr ""
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr ""
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
 "  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr ""
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr ""
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr ""
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr ""
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr ""
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr ""
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr ""
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr ""
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr ""
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr ""
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr ""
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr ""
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr ""
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr ""
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr ""
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr ""
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr ""
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr ""
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr ""
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr ""
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr ""
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr ""
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr ""
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr ""
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -848,112 +808,102 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr ""
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr ""
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr ""
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr ""
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr ""
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr ""
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr ""
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr ""
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr ""
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr ""
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr ""
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -964,38 +914,38 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr ""
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1003,148 +953,148 @@ msgid ""
 "                   line, incompatible with interactive mode).\n"
 msgstr ""
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr ""
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr ""
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr ""
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr ""
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr ""
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr ""
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr ""
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr ""
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr ""
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr ""
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr ""
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr ""
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr ""
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr ""
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr ""
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
 msgstr ""
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
 "%s\n"
 msgstr ""
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1155,32 +1105,32 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr ""
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that leads to remove.\n"
 msgstr ""
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1188,186 +1138,175 @@ msgid ""
 "                   default is %d.\n"
 msgstr ""
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr ""
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
 msgstr ""
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
 msgstr ""
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
 "                   X or text mode.\n"
 msgstr ""
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr ""
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr ""
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr ""
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1380,22 +1319,22 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr ""
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr ""
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr ""
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1405,66 +1344,66 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, c-format
 msgid "Install it"
 msgstr ""
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr ""
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr ""
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr ""
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr ""
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr ""
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr ""
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr ""
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr ""
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr ""
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1472,58 +1411,68 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
 msgstr ""
 
-#: ../urpmi:561 ../urpmi:570
+#: ../urpmi:488 ../urpmi:497
 #, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
 "%s\n"
 msgstr ""
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr ""
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr ""
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% / %s аткарылды, ETA = %s, ылдамдыгы = %s"
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% аткарылды, ылдамдыгы = %s"
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr ""
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr ""
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1531,57 +1480,57 @@ msgid ""
 "You may want to update your urpmi database"
 msgstr ""
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr ""
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr ""
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr ""
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr ""
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr ""
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr ""
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr ""
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr ""
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr ""
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1596,36 +1545,36 @@ msgid ""
 "and [options] are from\n"
 msgstr ""
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
 "                   hdlist file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1633,14 +1582,14 @@ msgid ""
 "                   anything else that has been configured ;-)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr ""
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1648,79 +1597,66 @@ msgid ""
 "                   installed mandrake-release package.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
 "                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr ""
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr ""
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr ""
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
+msgid "<relative path of hdlist> missing\n"
 msgstr ""
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
+msgid "`with' missing for network media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr ""
@@ -1737,6 +1673,13 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr ""
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1749,41 +1692,41 @@ msgid ""
 "(one of %s)\n"
 msgstr ""
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
 msgstr ""
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr ""
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr ""
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
 "(one of %s)\n"
 msgstr ""
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1794,120 +1737,137 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr ""
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr ""
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr ""
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr ""
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr ""
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr ""
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr ""
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr ""
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr ""
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: ../urpmq:160
+#: ../urpmq:147
 #, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgid "--list-nodes can only be used with --parallel"
 msgstr ""
 
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr ""
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "Белгисиз webfetch `%s' !!!\n"
 
-#: ../urpmq:216
-#, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr ""
+#~ msgid "copy failed: %s"
+#~ msgstr "копиялоо ийгиликсиз: %s"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "wget табылбады\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "wget ийгиликсиз: %d же %d сигналы менен чыкты\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "curl табылбады\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "curl ийгиликсиз: %d же %d сигналы менен чыкты\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "rsync табылбады\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "rsync ийгиликсиз: %d же %d сигналы менен чыкты\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "ssh табылбады\n"
diff --git a/po/lt.po b/po/lt.po
index c29a5add..94b9266c 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2001-03-04 15:40+0200\n"
 "Last-Translator: Mykolas Norvaišas <Myka@centras.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -50,22 +50,22 @@ msgstr ""
 "Automatinis paketų įdiegimas...\n"
 "Jūsų užklaustų paketų įdiegimas %s\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "Ar taip gerai?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "Gerai"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Nutraukti"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (T/n) "
@@ -75,382 +75,327 @@ msgstr " (T/n) "
 msgid "%s: command not found\n"
 msgstr "%s: komanda nerasta\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "where [options] are from\n"
 msgstr ""
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - parodyti šį pagalbos langa.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr ""
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, c-format
 msgid "                    defaults is %s.\n"
 msgstr ""
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr ""
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr ""
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr ""
 
-#: ../urpm.pm:189
-#, fuzzy, c-format
-msgid "copy failed: %s"
-msgstr "Įdiegimas nepavyko"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr ""
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr ""
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr ""
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr ""
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr ""
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr ""
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr ""
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr ""
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr ""
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, fuzzy, c-format
-msgid "...retrieving failed: %s"
-msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, fuzzy, c-format
 msgid "syntax error in config file at line %s"
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
 "medium"
 msgstr ""
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr ""
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
 "ignored"
 msgstr ""
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, fuzzy, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, fuzzy, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr ""
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, fuzzy, c-format
 msgid "unable to write config file [%s]"
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, fuzzy, c-format
 msgid "write config file [%s]"
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr ""
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr ""
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr ""
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr ""
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, fuzzy, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
 "update or --parallel"
 msgstr ""
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr ""
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr ""
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, fuzzy, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr ""
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, fuzzy, c-format
 msgid "skipping package %s"
 msgstr "nėra paketo su tokiu pavadinimu %s\n"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, fuzzy, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr ""
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr ""
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr ""
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr ""
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr ""
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, fuzzy, c-format
 msgid "...copying failed"
 msgstr "Įdiegimas nepavyko"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr ""
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
 "found)"
 msgstr ""
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, fuzzy, c-format
 msgid "retrieving hdlists file..."
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr ""
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, fuzzy, c-format
+msgid "...retrieving failed: %s"
+msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, fuzzy, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr ""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr ""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, fuzzy, c-format
 msgid "removing medium \"%s\""
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -458,372 +403,387 @@ msgid ""
 "medium."
 msgstr ""
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
 "ignored"
 msgstr ""
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, fuzzy, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr ""
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, fuzzy, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, fuzzy, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "Įdiegimas nepavyko"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, fuzzy, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, fuzzy, c-format
 msgid "reading rpm files from [%s]"
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr ""
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr ""
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, fuzzy, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, fuzzy, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr ""
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, fuzzy, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, fuzzy, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, fuzzy, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, fuzzy, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, fuzzy, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, fuzzy, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, fuzzy, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, fuzzy, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, fuzzy, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr ""
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, fuzzy, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr ""
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, fuzzy, c-format
 msgid "mounting %s"
 msgstr "įdiegiamas %s\n"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, fuzzy, c-format
 msgid "unmounting %s"
 msgstr "įdiegiamas %s\n"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr ""
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, fuzzy, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, fuzzy, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr ""
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr ""
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, fuzzy, c-format
 msgid "no package named %s"
 msgstr "nėra paketo su tokiu pavadinimu %s\n"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, fuzzy, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Šiuose paketuose yra %s: %s\n"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, fuzzy, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
 "  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr ""
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr ""
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "rpm duomenų bazės patikrinimas nepavyko\n"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr ""
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, fuzzy, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, fuzzy, c-format
 msgid "unable to access medium \"%s\""
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr ""
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, fuzzy, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr ""
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr ""
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr ""
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, fuzzy, c-format
 msgid "removing package %s"
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, fuzzy, c-format
 msgid "unable to remove package %s"
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr ""
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, fuzzy, c-format
 msgid "unable to install package %s"
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr ""
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr ""
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, fuzzy, c-format
 msgid "in order to keep %s"
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, fuzzy, c-format
 msgid "in order to install %s"
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr ""
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr ""
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr ""
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr ""
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr ""
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr ""
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: negai perskaityti rpm bylos \"%s\"\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Atsiprašau, blogas pasirinkimas, pakartokit\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -834,113 +794,102 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - parodyti šį pagalbos langa.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr ""
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - verbose mode.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpme:68
-#, fuzzy, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-"urpmi: nežinomas nustatymas \"-%s\", patikrinkite naudojimą su --help\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, fuzzy, c-format
 msgid "unknown packages"
 msgstr "nėra paketo su tokiu pavadinimu %s\n"
 
-#: ../urpme:91
+#: ../urpme:83
 #, fuzzy, c-format
 msgid "unknown package"
 msgstr "nėra paketo su tokiu pavadinimu %s\n"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr ""
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr ""
 
-#: ../urpme:107
+#: ../urpme:99
 #, fuzzy, c-format
 msgid "Checking to remove the following packages"
 msgstr "Vienas iš šių paketų yra reikalingas."
 
-#: ../urpme:114
+#: ../urpme:106
 #, fuzzy, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr "Priklausomybių patenkinimui, bus įdiegti šie paketai(%d Mb)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, fuzzy, c-format
 msgid " (y/N) "
 msgstr " (T/n) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, fuzzy, c-format
 msgid "removing %s"
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr ""
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Atsiprašau, blogas pasirinkimas, pakartokit\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -951,38 +900,38 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr ""
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -990,148 +939,148 @@ msgid ""
 "                   line, incompatible with interactive mode).\n"
 msgstr ""
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr ""
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr ""
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr ""
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr ""
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr ""
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr ""
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr ""
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr ""
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr ""
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr ""
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr ""
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr ""
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr ""
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr ""
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr ""
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
 msgstr ""
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
 "%s\n"
 msgstr ""
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1142,32 +1091,32 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr ""
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that leads to remove.\n"
 msgstr ""
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1175,187 +1124,175 @@ msgid ""
 "                   default is %d.\n"
 msgstr ""
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr ""
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
 msgstr ""
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
 msgstr ""
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
 "                   X or text mode.\n"
 msgstr ""
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr ""
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr ""
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr ""
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-"urpmi: nežinomas nustatymas \"-%s\", patikrinkite naudojimą su --help\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1368,22 +1305,22 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr ""
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr ""
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr ""
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1393,66 +1330,66 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, fuzzy, c-format
 msgid "Install it"
 msgstr "Įdiegimas nepavyko"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr ""
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr ""
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, fuzzy, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, fuzzy, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "Vienas iš šių paketų yra reikalingas."
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Vienas iš šių paketų yra reikalingas."
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Koks Jūsų pasirinkimas? (1-%d)"
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr ""
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "Ruošiama įdiegimui..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr ""
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1461,7 +1398,7 @@ msgid ""
 msgstr ""
 "kaikuriuos paketus reikia išmesti prieš atnaujinant, tai dar nepalaikoma \n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1469,51 +1406,61 @@ msgid ""
 msgstr ""
 "kaikuriuos paketus reikia išmesti prieš atnaujinant, tai dar nepalaikoma \n"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr "Priklausomybių patenkinimui, bus įdiegti šie paketai(%d Mb)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
 "%s\n"
 msgstr ""
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "negaliu gauti pirminių bylų, nutraukiu"
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Prašome įkišti laikmeną pavadintą \"%s\", į įrenginį [%s]"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, fuzzy, c-format
 msgid "Press Enter when ready..."
 msgstr "Prašome spausti 'enter', kada bus baigta..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, fuzzy, c-format
 msgid "Downloading package `%s'..."
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr ""
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr ""
+
+#: ../urpmi:606
 #, fuzzy, c-format
 msgid "The following packages have bad signatures"
 msgstr "Šiuose paketuose yra %s: %s\n"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr ""
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1521,57 +1468,57 @@ msgid ""
 "You may want to update your urpmi database"
 msgstr ""
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "Įdiegimas nepavyko"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, fuzzy, c-format
 msgid "distributing %s"
 msgstr "įdiegiamas %s\n"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, fuzzy, c-format
 msgid "installing %s"
 msgstr "įdiegiamas %s\n"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Įdiegiamas paketas `%s' (%s/%s)..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Pabandyti įdiegimą be priklausomybių tikrinimo? (t/N) "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Pabandyti įdiegimą priverstinai (--force)? (t/N) "
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "Įdiegimas nepavyko"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, fuzzy, c-format
 msgid "Installation is possible"
 msgstr "Įdiegimas nepavyko"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "viskas ir taip jau įdiegta"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr ""
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, fuzzy, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1594,36 +1541,36 @@ msgstr ""
 "       http://<host>/<path> with <relatyviu hdlist bylos vardu>\n"
 "       removable_<device>://<path>\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
 "                   hdlist file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1631,14 +1578,14 @@ msgid ""
 "                   anything else that has been configured ;-)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr ""
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1646,85 +1593,66 @@ msgid ""
 "                   installed mandrake-release package.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
 "                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, fuzzy, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr "nežinomi nustatymai \"%s\"\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, fuzzy, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, fuzzy, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"<relatyviu keliu iki hdlist> trūksta\n"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "<relatyviu keliu iki hdlist> trūksta\n"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr ""
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"<relatyviu keliu iki hdlist> trūksta\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<relatyviu keliu iki hdlist> trūksta\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, fuzzy, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"`with' tūkstama ftp laikmena\n"
+msgid "`with' missing for network media\n"
+msgstr "`with' tūkstama ftp laikmena\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr ""
@@ -1741,6 +1669,13 @@ msgstr "naudojimas: urpmi.addmedia <vardas> <url>"
 msgid "  -a             - select all media.\n"
 msgstr ""
 
+#: ../urpmi.removemedia:39
+#, fuzzy, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr "nežinomi nustatymai \"%s\"\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1755,34 +1690,34 @@ msgstr ""
 "tūksta įrašo išmetimui\n"
 "(vienas iš %s)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
 msgstr ""
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr ""
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr ""
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "nėra ką atnaujinti (pridėti laikmenai naudokite urpmi.addmedia)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1791,7 +1726,7 @@ msgstr ""
 "trūksta įrašo atnaujinimui\n"
 "(vienas iš %s)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1802,124 +1737,158 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr ""
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr ""
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr ""
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr ""
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr ""
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr ""
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr ""
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr ""
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr ""
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: ../urpmq:160
+#: ../urpmq:147
 #, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgid "--list-nodes can only be used with --parallel"
 msgstr ""
-"urpmq: nežinomas nustatymas \"-%s\", patikrinkite naudojimą su --help\n"
 
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: negai perskaityti rpm bylos \"%s\"\n"
+#, fuzzy
+#~ msgid "copy failed: %s"
+#~ msgstr "Įdiegimas nepavyko"
 
-#: ../urpmq:216
-#, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr ""
+#, fuzzy
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpmi: nežinomas nustatymas \"-%s\", patikrinkite naudojimą su --help\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpmi: nežinomas nustatymas \"-%s\", patikrinkite naudojimą su --help\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr "Priklausomybių patenkinimui, bus įdiegti šie paketai(%d Mb)"
+
+#, fuzzy
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "<relatyviu keliu iki hdlist> trūksta\n"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "<relatyviu keliu iki hdlist> trūksta\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "`with' tūkstama ftp laikmena\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpmq: nežinomas nustatymas \"-%s\", patikrinkite naudojimą su --help\n"
 
 #~ msgid "urpmf version %s"
 #~ msgstr "urpmf versija %s"
diff --git a/po/lv.po b/po/lv.po
index 6dc6e699..3e0cf18e 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2002-09-27 17:43+0200\n"
 "Last-Translator: Raivo Saars <spaiks@inbox.lv>\n"
 "Language-Team: ll10nt <ll10nt@listes.murds.lv>\n"
@@ -51,22 +51,22 @@ msgstr ""
 "Automātikā pakotņu uzstādīšana...\n"
 "Jūs lūdzāt uzstādīt pakotni %s\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "Vai piekrītat?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "Labi"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Atcelt"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (J/n) "
@@ -76,124 +76,63 @@ msgstr " (J/n) "
 msgid "%s: command not found\n"
 msgstr "%s: komanda nav atrata\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "where [options] are from\n"
 msgstr ""
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - izvadīt šo palīdzības ziņojumu.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, fuzzy, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "  --group         - drukāt iezīmi: grupa."
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, fuzzy, c-format
 msgid "                    defaults is %s.\n"
 msgstr "  --list         - izvadīt sarakstu ar pieejamām pakotnēm.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr ""
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "Nezināms protokols definēts priekš %s"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, fuzzy, c-format
 msgid "unable to handle protocol: %s"
 msgstr "nav iespējams izmantot protokolu: %s"
 
-#: ../urpm.pm:189
-#, fuzzy, c-format
-msgid "copy failed: %s"
-msgstr "...kopēšana neizdevās"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "wget nav atrodams\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget neizdevās: beidzās ar %d vai signālu %d\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "curl nav atrodams\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl neizdevās: beidzās ar %d vai signālu %d\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "rsync nav atrodams\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "rsync neizdevās: beidzās ar %d vai signālu %d\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "ssh nav atrodams\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr ""
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr ""
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...atgūšana neizdevās: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "sintakses kļūda konfigurācijas failā, rindā %s"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 "Datu nesējs \"%s\" mēģina lietot jau pielietotu hdlist, datu nesējs tiek "
 "ignorēts"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 "Datu nesējs \"%s\" mēģina lietot jau pielietotu sarakstu, datu nesējs tiek "
 "ignorēts"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -202,39 +141,39 @@ msgstr ""
 "nevaru parūpēties par datu nesēju \"%s\", jo saraksta failu lieto jau cits "
 "datu nesējs"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 "nevar izmantor vārdu \"%s\" priekš bezvārda datu nesēja, jo vārds ir jau "
 "izmantots"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, fuzzy, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr "nevar noteikt datu nesēju no hdlist faila [%s]"
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "nevar noteikt datu nesēju no hdlist faila [%s]"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "nevar piekļūt \"%s\" hdlist failam, datu nesējs tiek ignorēts"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, fuzzy, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "nevar piekļūt \"%s\" saraksta failam, datu nesējs tiek ignorēts"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, fuzzy, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "mēģināts izvēlēties neeksistējošu datu nesēju \"%s\""
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, fuzzy, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -243,231 +182,237 @@ msgstr ""
 "Datu nesējs \"%s\" mēģina lietot jau pielietotu hdlist, datu nesējs tiek "
 "ignorēts"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, fuzzy, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr ""
 "Datu nesējs \"%s\" mēģina lietot jau pielietotu sarakstu, datu nesējs tiek "
 "ignorēts"
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "nevaru atrast \"%s\" hdlist failu, datu nesējs tiek ignorēts"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 "nevar atrasta saraksta failu priekš \"%s\", datu nesējs neiks ņemts vērā"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, fuzzy, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr ""
 "nevar atrasta saraksta failu priekš \"%s\", datu nesējs neiks ņemts vērā"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "nevaru inspicēt \"%s\" saraksta failu, datu nesējs tiek ignorēts"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "pārāk daudz montēšanas punktu noņemamajam datu nesējam \"%s\""
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, fuzzy, c-format
 msgid "taking removable device as \"%s\""
 msgstr "ņemu noņemamo ierīci, kā \"%s\""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, fuzzy, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "lietoju citu noņemamo ierīci [%s] priekš \"%s\""
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, fuzzy, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "pārāk daudz montēšanas punktu noņemamajam datu nesējam \"%s\""
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "nevar saglabāt konfigurācijas failu [%s]"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "rakstu konfigurācijas failu [%s]"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, fuzzy, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "nav iespējams piekļūt rpm failam [%s]"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, fuzzy, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "eksaminēju hdlist failu [%s]"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr ""
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr ""
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "nav iespējams lietot paralēlo opciju \"%s\""
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, fuzzy, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
 "update or --parallel"
 msgstr "--synthesis nevar tikt lietots ar --media, --update vai --parallel"
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "eksaminēju synthesis failu [%s]"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "eksaminēju hdlist failu [%s]"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, fuzzy, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr ""
 "Datu nesējs \"%s\" mēģina lietot jau pielietotu sarakstu, datu nesējs tiek "
 "ignorēts"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, fuzzy, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "problēma nolasot datu nesēja \"%s\" synthesis failu"
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr ""
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, fuzzy, c-format
 msgid "skipping package %s"
 msgstr "nav pakotnes ar nosaukumu %s"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, fuzzy, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "nevaru noņemt pakotni %s"
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, fuzzy, c-format
 msgid "unable to open rpmdb"
 msgstr "nav iespējams reģistrēt rpm failu"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "datu nesējs \"%s\" jau eksistē"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr ""
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "pievienoju datu nesēju %s."
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "nav iespējams piekļūt pirmajam instalācijas datu nesējam"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "kopēju hdlists failu..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, fuzzy, c-format
 msgid "...copying failed"
 msgstr "...kopēšana veikta"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "...kopēšana veikta"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, fuzzy, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
 "found)"
 msgstr "nav iespējams piekļūt pirmajam instalācijas datu nesējam"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "atgūstu hdlists failu..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "...atgūšana veikta"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...atgūšana neizdevās: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "nederīgs hdlist apraksts \"%s\" hdlists failā"
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, fuzzy, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "mēģināts izvēlēties neeksistējošu datu nesēju \"%s\""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, fuzzy, c-format
 msgid "selecting multiple media: %s"
 msgstr "izvēlos vairākas vides: %s"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "noņemu datu nesēju \"%s\""
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -475,7 +420,7 @@ msgid ""
 "medium."
 msgstr ""
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, fuzzy, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -484,365 +429,380 @@ msgstr ""
 "Datu nesējs \"%s\" mēģina lietot jau pielietotu hdlist, datu nesējs tiek "
 "ignorēts"
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "kopēju \"%s\" apraksta failu ..."
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, fuzzy, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "saraksta fails priekš \"%s\" ir tukšs"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, fuzzy, c-format
 msgid "examining MD5SUM file"
 msgstr "eksaminēju hdlist failu [%s]"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, fuzzy, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "saraksta fails priekš \"%s\" ir tukšs"
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, fuzzy, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "saraksta fails priekš \"%s\" ir tukšs"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, fuzzy, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "[%s] kopēšana neizdevās"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "problēma nolasot datu nesēja \"%s\" synthesis failu"
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "nolasu rpm failus no [%s]"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "neizdevās nolasīt rpm failus no [%s]: %s"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "netika atrasti rpm faili no [%s]"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, fuzzy, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "atgūstu \"%s\" apraksta failu..."
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, fuzzy, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "saraksta fails priekš \"%s\" ir tukšs"
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "saraksta fails priekš \"%s\" ir tukšs"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr ""
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "netika atrasts hdlist fails priekš datu nesēja \"%s\""
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "fails [%s] jau tiek lietots tai pašā datu nesējā \"%s\""
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "nevaru izanalizēt \"%s\" hdlist failu"
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "nevaru ierakstīt \"%s\" saraksta failu"
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, fuzzy, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "netika atrasts hdlist fails priekš datu nesēja \"%s\""
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "saraksta fails priekš \"%s\" ir tukšs"
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, fuzzy, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "atgūstu \"%s\" apraksta failu..."
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, fuzzy, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "nevaru ierakstīt \"%s\" saraksta failu"
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, fuzzy, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "nevaru ierakstīt \"%s\" saraksta failu"
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, fuzzy, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "ielasu sākumus no datu nesēja \"%s\""
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "būvēju hdlist [%s]"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "uzbūvēju hdlist synthesis failu priekš datu nesēja \"%s\""
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "atradu %d iesākumus kešatmiņā"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "izņemu %d novecojušus iesākumus no kešatmiņas"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "montēju %s"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "atmontēju %s"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr ""
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "nederīgs rpm faila vārds [%s]"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, fuzzy, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "atgūstu rpm failus..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "nav iespējams piekļūt rpm failam [%s]"
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, fuzzy, c-format
 msgid "unable to register rpm file"
 msgstr "nav iespējams piekļūt rpm failam [%s]"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "kļūda reģistrējot lokālās pakotnes"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "nav pakotnes ar nosaukumu %s"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Sekojošas pakotnes satur %s: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "ir vairākas pakotnes ar vienādu rpm faila vārdu \"%s\""
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, fuzzy, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "nav iespējams nolasīt rpm failu [%s] no datu nesēja \"%s\""
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
 "  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr ""
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "pakotne %s nav atrasta."
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "urpmi datubāze noslēgta"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "datu nesējs \"%s\" nav izvēlēts"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "nav iespējams nolasīt rpm failu [%s] no datu nesēja \"%s\""
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "nav iespējams piekļūt datu nesējam \"%s\""
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "nepareizi izveidots ievads: [%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, fuzzy, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "atgūstu rpm failus..."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "Sagatavoju..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr ""
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, fuzzy, c-format
 msgid "unable to create transaction"
 msgstr "nevar izveidot datu nesēju \"%s\"\n"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, fuzzy, c-format
 msgid "removing package %s"
 msgstr "nevaru noņemt pakotni %s"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "nevaru noņemt pakotni %s"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr ""
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "nevaru instalēt pakotni %s"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, fuzzy, c-format
 msgid "due to missing %s"
 msgstr "wget nav atrodams\n"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, fuzzy, c-format
 msgid "trying to promote %s"
 msgstr "Nav nekā, ko noņemt.\n"
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, fuzzy, c-format
 msgid "in order to keep %s"
 msgstr "nevaru instalēt pakotni %s"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, fuzzy, c-format
 msgid "in order to install %s"
 msgstr "nevaru instalēt pakotni %s"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, fuzzy, c-format
 msgid "due to conflicts with %s"
 msgstr "%s konflikē ar %s"
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr ""
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr ""
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr ""
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr ""
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr ""
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr ""
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Atvainojiet, nepareiza izvēle. Mēģiniet vēlreiz\n"
+
+#: ../urpme:36
 #, fuzzy, c-format
 msgid ""
 "urpme version %s\n"
@@ -858,113 +818,103 @@ msgstr ""
 "\n"
 "pielietojums:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - izvadīt šo palīdzības ziņojumu.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 "  --test         - pārbaudīt, vai instalācija var tikt veikta korekti.\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, fuzzy, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --curl         - lietot curl, lai iegūtu attālinātos failus.\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - runīgais režīms.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, fuzzy, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -c             - iztīrīt iesākumu kešatmiņas direktoriju.\n"
 
-#: ../urpme:68
-#, fuzzy, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: nezināma opcija \"-%s\", pārbaudiet pielietojumu ar --help\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, fuzzy, c-format
 msgid "unknown packages"
 msgstr "nezināmas pakotnes"
 
-#: ../urpme:91
+#: ../urpme:83
 #, fuzzy, c-format
 msgid "unknown package"
 msgstr "nezināma pakotne"
 
-#: ../urpme:101
+#: ../urpme:93
 #, fuzzy, c-format
 msgid "removing package %s will break your system"
 msgstr "pakotnes %s noņemšana sabojās Jūsu sistēmu\n"
 
-#: ../urpme:103
+#: ../urpme:95
 #, fuzzy, c-format
 msgid "Nothing to remove"
 msgstr "Nav nekā, ko noņemt.\n"
 
-#: ../urpme:107
+#: ../urpme:99
 #, fuzzy, c-format
 msgid "Checking to remove the following packages"
 msgstr "Ir nepieciešama viena no sekojošām pakotnēm:"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr "Lai apmierinātu atkarības, tiks noņemtas sekojošas pakotnes (%d MB)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (j/N) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, fuzzy, c-format
 msgid "removing %s"
 msgstr "nevaru noņemt pakotni %s"
 
-#: ../urpme:123
+#: ../urpme:115
 #, fuzzy, c-format
 msgid "Removing failed"
 msgstr "...kopēšana neizdevās"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Atvainojiet, nepareiza izvēle. Mēģiniet vēlreiz\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, fuzzy, c-format
 msgid ""
 "urpmf version %s\n"
@@ -981,38 +931,38 @@ msgstr ""
 "\n"
 "pielietojums:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, fuzzy, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --update       - izveidot atjaunināšanas datu nesēju.\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, fuzzy, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --update       - izveidot atjaunināšanas datu nesēju.\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, fuzzy, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr "  --update       - izveidot atjaunināšanas datu nesēju.\n"
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, fuzzy, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  -v             - runīgais režīms.\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, fuzzy, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1021,148 +971,148 @@ msgid ""
 msgstr ""
 "  --quiet         - nedrukāt iezīmes vārdu (noklusētais, ja iezīme nav dota"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, fuzzy, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --size          - drukāt iezīmi: izmērs."
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, fuzzy, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all           - drukāt visas iezīmes."
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, fuzzy, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group         - drukāt iezīmi: grupa."
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, fuzzy, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size          - drukāt iezīmi: izmērs."
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, fuzzy, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --size          - drukāt iezīmi: izmērs."
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, fuzzy, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary       - drukāt iezīmi: kopsavilkums."
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, fuzzy, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description   - drukāt iezīmui: apraksts."
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, fuzzy, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr "  --group         - drukāt iezīmi: grupa."
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, fuzzy, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr "  --group         - drukāt iezīmi: grupa."
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, fuzzy, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr "  --files         - drukāt iezīmi: faili (vairākas rindiņas)."
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, fuzzy, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --serial        - drukāt iezīmi: seriālais numurs."
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, fuzzy, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr "  --provides      - drukāt iezīmi: nodrošina (vairākas rindiņas)."
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, fuzzy, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr "  --requires      - drukāt iezīmi: nepieciešamas (vairākas rindiņas)."
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, fuzzy, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files         - drukāt iezīmi: faili (vairākas rindiņas)."
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, fuzzy, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr "  --conflicts     - drukāt iezīmi: konflikti (vairākas rindiņas)."
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, fuzzy, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr "  --obsoletes     - drukāt iezīmi: novecojušas (vairākas rindiņas)."
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
 msgstr ""
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, fuzzy, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr "  -f             - forsēt hdlist failu ģenerēšanu.\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, fuzzy, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -c             - iztīrīt iesākumu kešatmiņas direktoriju.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, fuzzy, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  -f             - forsēt hdlist failu ģenerēšanu.\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, fuzzy, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr "  -c             - iztīrīt iesākumu kešatmiņas direktoriju.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, fuzzy, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr "  -c             - iztīrīt iesākumu kešatmiņas direktoriju.\n"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
 "%s\n"
 msgstr ""
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1178,32 +1128,32 @@ msgstr ""
 "\n"
 "pielietojums:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr ""
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that leads to remove.\n"
 msgstr ""
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1211,80 +1161,80 @@ msgid ""
 "                   default is %d.\n"
 msgstr ""
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - izņemt rpm no kešatmiņas, pirms darīt ko citu.\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr ""
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - lietot wget, lai iegūtu attālinātos failus.\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - lietot curl, lai iegūtu attālinātos failus.\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1294,7 +1244,7 @@ msgstr ""
 "                   ka ir 1080 pēc noklusēšanas (formāts ir <proxy_hosts[:"
 "ports]>).\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1304,99 +1254,88 @@ msgstr ""
 "                   priekš proxy autentifikācijas (formāts ir <lietotājs:"
 "parole>).\n"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
 msgstr ""
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - lietot X saskarni.\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
 "                   X or text mode.\n"
 msgstr ""
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr ""
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - klusais režīms.\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr ""
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr ""
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: nezināma opcija \"-%s\", pārbaudiet pielietojumu ar --help\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1409,22 +1348,22 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "Nedarīt neko"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr ""
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr ""
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1434,54 +1373,54 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, fuzzy, c-format
 msgid "Install it"
 msgstr "Instalēšana neizdevās"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr ""
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Nevarēju izveidot direktoriju [%s] kļūdu ziņojumam"
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, fuzzy, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Tikai root drīkst instalēt pakotnes"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "Lai instakētu %s, ir nepieciešama viena no sekojošām pakotnēm:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Ir nepieciešama viena no sekojošām pakotnēm:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Kāda ir jūsu izvēle? (1-%d) "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr ""
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr ""
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, fuzzy, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1491,12 +1430,12 @@ msgstr ""
 "%s\n"
 "vai piekrītat?"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr ""
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1507,7 +1446,7 @@ msgstr ""
 "%s\n"
 "vai piekrītat?"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1517,14 +1456,14 @@ msgstr ""
 "%s\n"
 "vai piekrītat?"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr "Lai apmierinātu atkarības, tiks instalētas sekojošas pakotnes (%d MB)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1533,37 +1472,47 @@ msgstr ""
 "Jums jābūt root, lai instalētu sekojošas atkarības:\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "nevar dabūt koda pakotnes, pārtraucu"
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Lūdzu ielieciet datu nesēju \"%s\" ierīcē [%s]"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Nospiediet Enter, kad gatavs..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, fuzzy, c-format
 msgid "Downloading package `%s'..."
 msgstr "nevaru noņemt pakotni %s"
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr ""
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr ""
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Sekojošām pakotnēm ir slikti paraksti"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Vēlaties turpināt instalēšanu?"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1571,57 +1520,57 @@ msgid ""
 "You may want to update your urpmi database"
 msgstr ""
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "Instalēšana neizdevās"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, fuzzy, c-format
 msgid "distributing %s"
 msgstr "izplatu %s\n"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, fuzzy, c-format
 msgid "installing %s"
 msgstr "tiek instalēta %s\n"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Vai mēģināt instalēt bez atkarību pārbaudes? (j/N) "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Vai mēģināt instalēt vēl uzstājīgāk (--force)? (j/N) "
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "Instalēšana neizdevās"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "Instalēšana ir iespējama"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "viss jau ir instalēts"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr ""
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1647,23 +1596,23 @@ msgstr ""
 "\n"
 "un [opcijas] ir no\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - izveidot atjaunināšanas datu nesēju.\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, fuzzy, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
 "  -h             - mēģināt atrast un lietot synthesis vai hdlist failu.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, fuzzy, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
@@ -1671,7 +1620,7 @@ msgid ""
 msgstr ""
 "  -h             - mēģināt atrast un lietot synthesis vai hdlist failu.\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, fuzzy, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -1680,7 +1629,7 @@ msgstr ""
 "  --distrib      - automātiski veidot visas vides no instalācijas datu "
 "nesēja.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1688,14 +1637,14 @@ msgid ""
 "                   anything else that has been configured ;-)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr ""
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1703,87 +1652,66 @@ msgid ""
 "                   installed mandrake-release package.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
 "                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, fuzzy, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - iztīrīt iesākumu kešatmiņas direktoriju.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - forsēt hdlist failu ģenerēšanu.\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"nezināmas opcijas '%s'\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, fuzzy, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "atgūstu rpm failus..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"nav nepieciešams uzrādīt <hdlist relatīvo ceļu> ar --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "nav nepieciešams uzrādīt <hdlist relatīvo ceļu> ar --distrib"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "nevar atjaunot datu nesēju \"%s\"\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"<relative path of hdlist> trūkst\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<relative path of hdlist> trūkst\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, fuzzy, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"`with' trūkst priekš ftp datu avota\n"
+msgid "`with' missing for network media\n"
+msgstr "`with' trūkst priekš ftp datu avota\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "nevar izveidot datu nesēju \"%s\"\n"
@@ -1802,6 +1730,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr ""
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"nezināmas opcijas '%s'\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1814,7 +1751,7 @@ msgid ""
 "(one of %s)\n"
 msgstr ""
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1823,28 +1760,28 @@ msgstr ""
 "lietojums: urpmi.update [opcijas] <vārds> ...\n"
 "kur <vārds> atjaunināmā datu nesēja vārds.\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, fuzzy, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - izveidot atjaunināšanas datu nesēju.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr ""
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "nav ko atjaunināt (lietojiet urpmi.addmedia, lai pievienotu datu nesēju)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1853,7 +1790,7 @@ msgstr ""
 "atjuninājumā trūkst kāda ieraksta\n"
 "(viens no %s)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1870,68 +1807,68 @@ msgstr ""
 "\n"
 "pielietojums:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - izvadīt sarakstu ar pieejamām pakotnēm.\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr ""
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, fuzzy, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list         - izvadīt sarakstu ar pieejamām pakotnēm.\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, fuzzy, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list         - izvadīt sarakstu ar pieejamām pakotnēm.\n"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, fuzzy, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --all           - drukāt visas iezīmes."
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -1939,57 +1876,111 @@ msgid ""
 msgstr ""
 "  -u             - noņemt pakotni, ja ir uzinstalēta jaunāka versija.\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, fuzzy, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "                    dota komandrindā; bez pakotnes vārda)."
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, fuzzy, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  --X            - lietot X saskarni.\n"
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, fuzzy, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -f             - forsēt hdlist failu ģenerēšanu.\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr ""
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr ""
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, fuzzy, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  --list         - izvadīt sarakstu ar pieejamām pakotnēm.\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: ../urpmq:160
-#, fuzzy, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: nezināma opcija \"-%s\", pārbaudiet pielietojumu ar --help\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr ""
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, fuzzy, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--synthesis nevar tikt lietots ar --media, --update vai --parallel"
 
 #, fuzzy
+#~ msgid "copy failed: %s"
+#~ msgstr "...kopēšana neizdevās"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "wget nav atrodams\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "wget neizdevās: beidzās ar %d vai signālu %d\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "curl nav atrodams\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "curl neizdevās: beidzās ar %d vai signālu %d\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "rsync nav atrodams\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "rsync neizdevās: beidzās ar %d vai signālu %d\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "ssh nav atrodams\n"
+
+#, fuzzy
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmi: nezināma opcija \"-%s\", pārbaudiet pielietojumu ar --help\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmi: nezināma opcija \"-%s\", pārbaudiet pielietojumu ar --help\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr ""
+#~ "Lai apmierinātu atkarības, tiks instalētas sekojošas pakotnes (%d MB)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "nav nepieciešams uzrādīt <hdlist relatīvo ceļu> ar --distrib"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "<relative path of hdlist> trūkst\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "`with' trūkst priekš ftp datu avota\n"
+
+#, fuzzy
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmi: nezināma opcija \"-%s\", pārbaudiet pielietojumu ar --help\n"
+
+#, fuzzy
 #~ msgid ""
 #~ "  --name         - print tag name: rpm filename (assumed if no tag given "
 #~ "on\n"
diff --git a/po/mn.po b/po/mn.po
index 6f9c4dd9..aa8d3150 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2003-08-22 19:38+0200\n"
 "Last-Translator: Khurelbaatar Lkhagvasuren <hujii247@yahoo.com>\n"
 "Language-Team: Mongolian <openmn-core@lists.sourceforge.net>\n"
@@ -49,22 +49,22 @@ msgid ""
 "You requested installation of package %s\n"
 msgstr "Автоматаар аас аас с"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, fuzzy, c-format
 msgid "Is this OK?"
 msgstr "Ок?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, fuzzy, c-format
 msgid "Ok"
 msgstr "Ок"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, fuzzy, c-format
 msgid "Cancel"
 msgstr "Хүчингүй"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) "
@@ -74,382 +74,327 @@ msgstr " (Y/n) "
 msgid "%s: command not found\n"
 msgstr "%s: тушаал олдсонгүй\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "where [options] are from\n"
 msgstr ""
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - Энэ тусламжийг хэвлэх.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, fuzzy, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "бүлэг бүлэг бүлэг"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, fuzzy, c-format
 msgid "                    defaults is %s.\n"
 msgstr "  --list         - боломжтой багцуудын жагсаалт.\n"
 
-#: ../urpm.pm:109
-#, fuzzy, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Тодорхойгүй с"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "%s-ийн хувьд үл мэдэгдэх протокол тодорхойлогдсон"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr ""
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr ""
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "wget байхгүй байна\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr ""
-
-#: ../urpm.pm:243
-#, fuzzy, c-format
-msgid "curl is missing\n"
-msgstr "бол"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr ""
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, fuzzy, c-format
-msgid "rsync is missing\n"
-msgstr "бол"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr ""
-
-#: ../urpm.pm:396
-#, fuzzy, c-format
-msgid "ssh is missing\n"
-msgstr "бол"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, fuzzy, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "с аас с с"
-
-#: ../urpm.pm:451 ../urpmi:660
-#, fuzzy, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "с"
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...хүлээн авалт бүтэлгүйтлээ: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "config файлын %s мөрөнд бичэглэлийн алдаа"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, fuzzy, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr "с"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, fuzzy, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr "с жигсаалт"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, fuzzy, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
 "medium"
 msgstr "аас с жигсаалт бол"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, fuzzy, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr "нэр с бол"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, fuzzy, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr "с үгүй жигсаалт с"
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, fuzzy, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "аас с"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, fuzzy, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "аас с"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, fuzzy, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "жигсаалт аас с"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, fuzzy, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "с"
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, fuzzy, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
 "ignored"
 msgstr "с"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, fuzzy, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "с жигсаалт"
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, fuzzy, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "с"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, fuzzy, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "жигсаалт с"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, fuzzy, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "жигсаалт с"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, fuzzy, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "жигсаалт с"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, fuzzy, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "Цэг с"
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, fuzzy, c-format
 msgid "taking removable device as \"%s\""
 msgstr "с"
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, fuzzy, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "с с"
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, fuzzy, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "с"
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "[%s] тохируулгын файлыг бичиж болсонгүй"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, fuzzy, c-format
 msgid "write config file [%s]"
 msgstr "с"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, fuzzy, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "с ямх с"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, fuzzy, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "ямх с"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr ""
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, fuzzy, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "горим"
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, fuzzy, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "с"
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
 "update or --parallel"
 msgstr ""
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, fuzzy, c-format
 msgid "examining synthesis file [%s]"
 msgstr "с"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, fuzzy, c-format
 msgid "examining hdlist file [%s]"
 msgstr "с"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, fuzzy, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "с жигсаалт"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, fuzzy, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "аас с"
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, fuzzy, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "секунд"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "%s багцийг алгасаж байна"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, fuzzy, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "%s багцийг устгаж болсонгүй"
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "rpmdb-г нээж болсонгүй"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, fuzzy, c-format
 msgid "medium \"%s\" already exists"
 msgstr "с"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr ""
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr ""
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr ""
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr ""
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "...хуулалт бүтэлгүйтэв"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "...хуулждууслаа"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, fuzzy, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
 "found)"
 msgstr "үгүй"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "hdlists файлыг хүлээн авч байна..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "...хүлээн авалт дууслаа"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...хүлээн авалт бүтэлгүйтлээ: %s"
+
+#: ../urpm.pm:713
 #, fuzzy, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "хүчингүй Тодорхойлолт с ямх"
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, fuzzy, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "с"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr ""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, fuzzy, c-format
 msgid "removing medium \"%s\""
 msgstr "с"
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -457,229 +402,229 @@ msgid ""
 "medium."
 msgstr ""
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, fuzzy, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
 "ignored"
 msgstr "с"
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, fuzzy, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "Тодорхойлолт аас с."
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, fuzzy, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "аас"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "MD5SUM файлыг шалгаж байна"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, fuzzy, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "аас с."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, fuzzy, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "аас"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, fuzzy, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "аас с"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, fuzzy, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "аас с"
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, fuzzy, c-format
 msgid "reading rpm files from [%s]"
 msgstr "с"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, fuzzy, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "с"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "[%s]-ээс ямар нэг rpm олдсонгүй"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, fuzzy, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "аас с."
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr ""
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "аас"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr ""
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, fuzzy, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "аас"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, fuzzy, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "үгүй с"
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, fuzzy, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "с ямх с"
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, fuzzy, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "аас с"
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, fuzzy, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "жигсаалт аас с"
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, fuzzy, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "жигсаалт с"
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, fuzzy, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "юу ч үгүй ямх жигсаалт с"
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, fuzzy, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "\"%s\" файлын шинжүүдийг хүлээн авч байна..."
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, fuzzy, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "жигсаалт аас с"
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, fuzzy, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "с"
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "hdlist [%s]-ийг байгуулж байна"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, fuzzy, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "с"
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "%d толгой кэйшид олдлоо"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, fuzzy, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "ямх"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr ""
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "%s-ийг салгаж байна"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, fuzzy, c-format
 msgid "relocated %s entries in depslist"
 msgstr "с ямх"
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, fuzzy, c-format
 msgid "no entries relocated in depslist"
 msgstr "үгүй ямх"
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "буруу rpm файлын нэр [%s]"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "rpm файлыг хүлээн авч байна [%s] ..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "[%s] rpm файл руу хандаж болсонгүй"
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "rpm файлыг бүртгэж болсонгүй"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, fuzzy, c-format
 msgid "error registering local packages"
 msgstr "локал"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "%s нэртэй багц байхгүй байна"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Дараах багцууд %s: %s-ийг агуулж байна"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "энд \"%s\" гэсэн ижил rpm файл нэртэй олон багцууд байна"
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, fuzzy, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "с с"
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, fuzzy, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -688,143 +633,158 @@ msgstr ""
 "с хүчингүй жигсаалт\n"
 " бол"
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, fuzzy, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "с"
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, fuzzy, c-format
 msgid "package %s is not found."
 msgstr "с бол."
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr ""
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, fuzzy, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "с бол"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, fuzzy, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "с с"
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, fuzzy, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "с"
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, fuzzy, c-format
 msgid "unable to access medium \"%s\""
 msgstr "с"
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, fuzzy, c-format
 msgid "malformed input: [%s]"
 msgstr "с"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, fuzzy, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "с."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "Бэлдэж байна..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr ""
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, fuzzy, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr "с"
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr ""
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "%s багцийг устгалт"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "%s багцийг устгаж болсонгүй"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, fuzzy, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "с с"
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "%s багцийг суулгаж болсонгүй"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr ""
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, fuzzy, c-format
 msgid "trying to promote %s"
 msgstr "Юу ч үгүй"
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, fuzzy, c-format
 msgid "in order to keep %s"
 msgstr "ямх"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, fuzzy, c-format
 msgid "in order to install %s"
 msgstr "ямх"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr ""
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr ""
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr ""
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr ""
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr ""
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "тушаалын мөрөнд буруу proxy зарлалт\n"
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: rpm файлыг уншиж чадахгүй \"%s\"\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Харамсалтай нь буруу сонголт байна, дахин ородоно уу!\n"
+
+#: ../urpme:36
 #, fuzzy, c-format
 msgid ""
 "urpme version %s\n"
@@ -835,112 +795,102 @@ msgid ""
 "usage:\n"
 msgstr "с MandrakeSoft бол аас г"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - Энэ тусламжийг хэвлэх.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, fuzzy, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "ямх"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, fuzzy, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "аас"
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, fuzzy, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "Мөр"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, fuzzy, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - Ажилуулах горим.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpme:68
-#, fuzzy, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "Тодорхойгүй с"
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr "үл мэдэгдэх багцууд"
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "үл мэдэгдэх багц"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "%s багцийг устгах нь таны системийн ажиллагааг таслах болно"
 
-#: ../urpme:103
+#: ../urpme:95
 #, fuzzy, c-format
 msgid "Nothing to remove"
 msgstr "Юу ч үгүй"
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "Дараах багцуудыг устгахаар шалгаж байна"
 
-#: ../urpme:114
+#: ../urpme:106
 #, fuzzy, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr "тийш МБ"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (y/N) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, fuzzy, c-format
 msgid "removing %s"
 msgstr "%s багцийг устгалт"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr ""
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Харамсалтай нь буруу сонголт байна, дахин ородоно уу!\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, fuzzy, c-format
 msgid ""
 "urpmf version %s\n"
@@ -951,38 +901,38 @@ msgid ""
 "usage:\n"
 msgstr "с MandrakeSoft бол аас г"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, fuzzy, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr "аас"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, fuzzy, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "горим"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, fuzzy, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -992,148 +942,148 @@ msgstr ""
 "аяархан нэр үгүй\n"
 " горим"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, fuzzy, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "Мөр"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all          - бүх тагуудыг хэвлэх.\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, fuzzy, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "бүлэг бүлэг бүлэг"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, fuzzy, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "хэмжээ хэмжээ хэмжээ"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr ""
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr ""
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, fuzzy, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "Тодорхойлолт Тодорхойлолт Тодорхойлолт"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr ""
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr ""
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr ""
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr ""
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr ""
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr ""
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr ""
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr ""
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
 msgstr ""
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, fuzzy, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr "ямх"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, fuzzy, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "нэр"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, fuzzy, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "e e"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, fuzzy, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
 msgstr "бол"
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, fuzzy, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "бол"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, fuzzy, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr "зүүн бүлэг"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, fuzzy, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr "баруун бүлэг"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, fuzzy, c-format
 msgid ""
 "callback is :\n"
 "%s\n"
 msgstr "бол г с"
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, fuzzy, c-format
 msgid "using specific environment on %s\n"
 msgstr "с"
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, fuzzy, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1144,32 +1094,32 @@ msgid ""
 "usage:\n"
 msgstr "с MandrakeSoft бол аас г"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, fuzzy, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "аас"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr ""
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that leads to remove.\n"
 msgstr ""
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1177,73 +1127,73 @@ msgid ""
 "                   default is %d.\n"
 msgstr ""
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, fuzzy, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "т"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, fuzzy, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "бол с"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, fuzzy, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "үгүй"
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, fuzzy, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "ямх"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, fuzzy, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1252,7 +1202,7 @@ msgstr ""
 "\n"
 " үгүй бол"
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, fuzzy, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1261,7 +1211,7 @@ msgstr ""
 "бол\n"
 " бол<proxyhost[:port]>"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, fuzzy, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1270,19 +1220,19 @@ msgstr ""
 "\n"
 " бол<user:password>"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, fuzzy, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
 msgstr "гаралт ямх\n"
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, fuzzy, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "X X"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, fuzzy, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1291,7 +1241,7 @@ msgstr ""
 "гаралт\n"
 " X текст горим"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, fuzzy, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1300,74 +1250,62 @@ msgstr ""
 "\n"
 " үгүй бол"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr ""
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, fuzzy, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "Нээх"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, fuzzy, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "ямх"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, fuzzy, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "ямх"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, fuzzy, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "т"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, fuzzy, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "с бол"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, fuzzy, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "аяархан горим"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, fuzzy, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "Нээх"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr ""
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "тушаалын мөрөнд буруу proxy зарлалт\n"
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-"urpmi: үл мэдэгдэх сонголт \"-%s\", хэрэглэх зааврыг --help гэж үзнэ үү!\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, fuzzy, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr "Хийгдсэн"
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1380,22 +1318,22 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr ""
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr ""
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr ""
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1405,66 +1343,66 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, fuzzy, c-format
 msgid "Install it"
 msgstr "%s-ийг суулгаж байна\n"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr ""
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, fuzzy, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "с"
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, fuzzy, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "бол"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "%s-ийг суулгахын тулд дараах багцуудын нэг нь шаардлагатай:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Дараах багцуудын нэг нь шаардлагатай:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Таны сонголт юу бэ? (1-%d) "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "Багц суулгалт..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "Урьдчилан бэлдэж байна..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, fuzzy, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
 "%s"
 msgstr "г с вы?"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr ""
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1472,58 +1410,68 @@ msgid ""
 "%s\n"
 msgstr "г с вы?"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
 msgstr "г с вы?"
 
-#: ../urpmi:561 ../urpmi:570
+#: ../urpmi:488 ../urpmi:497
 #, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr "тийш МБ"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, fuzzy, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
 "%s\n"
 msgstr "Та г с"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "с с"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Бэлэн болонгуут Enter товчоо дарна уу..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "`%s' багцыг татан авч байна..."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, fuzzy, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "с аас с с"
+
+#: ../urpmi:587
+#, fuzzy, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "с"
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr ""
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Та суулгалтыг үргэлжлүүлэхийг хүсэж байна уу?"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1534,57 +1482,57 @@ msgstr ""
 "%s\n"
 "Та магадгүй urpmi баазаа шинэчлэх хэрэгтэй байх"
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr ""
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, fuzzy, c-format
 msgid "distributing %s"
 msgstr "хуваариалж байна %s\n"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, fuzzy, c-format
 msgid "installing %s"
 msgstr "%s-ийг суулгаж байна\n"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "`%s' (%s/%s) багцийг суулгаж байна..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Хамаарлыг шалгахгүйгээр суулгахыг оролдох уу? (y/N) "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, fuzzy, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Reyna т N "
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "Суулгалт боломжтой"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "Суулгалт боломжтой"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "Бүх зүйл хэдийн суусан байна"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr ""
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, fuzzy, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1605,36 +1553,36 @@ msgstr ""
 "<host><path><relative filename of hdlist>\n"
 "<path> г"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, fuzzy, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
 "                   hdlist file.\n"
 msgstr "үгүй\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, fuzzy, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1644,7 +1592,7 @@ msgstr ""
 "аас\n"
 "\n"
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, fuzzy, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1653,7 +1601,7 @@ msgstr ""
 "жигсаалт аас бол\n"
 " с"
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, fuzzy, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1663,83 +1611,68 @@ msgstr ""
 "бол\n"
 " аас\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, fuzzy, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
 "                   mandrake-release package installed.\n"
 msgstr "бол аас\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - түр санах ойн хавтасын толгойг цэвэрлэх.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, fuzzy, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "аас"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"үл мэдэгдэх сонголтууд '%s'\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, fuzzy, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "аас"
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, fuzzy, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "с."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, fuzzy, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr "с<relative path of hdlist>"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, fuzzy, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "с"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, fuzzy, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
+msgid "<relative path of hdlist> missing\n"
 msgstr ""
 "с\n"
 "<relative path of hdlist>"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, fuzzy, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
+msgid "`with' missing for network media\n"
 msgstr "с г"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, fuzzy, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "с"
@@ -1756,6 +1689,15 @@ msgstr "<name><name> бол нэр"
 msgid "  -a             - select all media.\n"
 msgstr ""
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"үл мэдэгдэх сонголтууд '%s'\n"
+
 #: ../urpmi.removemedia:48
 #, fuzzy, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1768,41 +1710,41 @@ msgid ""
 "(one of %s)\n"
 msgstr "бол г аас с"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, fuzzy, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
 msgstr "<name><name> бол нэр"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr ""
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr ""
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, fuzzy, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "юу ч үгүй"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, fuzzy, c-format
 msgid ""
 "the entry to update is missing\n"
 "(one of %s)\n"
 msgstr "бол г аас с"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, fuzzy, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1813,126 +1755,173 @@ msgid ""
 "usage:\n"
 msgstr "с MandrakeSoft бол аас г"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - боломжтой багцуудын жагсаалт.\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, fuzzy, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "жигсаалт жигсаалт"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, fuzzy, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "жигсаалт жигсаалт"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, fuzzy, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr "жигсаалт жигсаалт"
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, fuzzy, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "жигсаалт жигсаалт"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, fuzzy, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --all          - бүх тагуудыг хэвлэх.\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, fuzzy, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr "бол"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, fuzzy, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "гаралт"
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, fuzzy, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 "  -i             - хэрэгтэй мэдээллийг хүн уншиж болохоор хэлбэрээр хэвлэх.\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, fuzzy, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "нэр"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, fuzzy, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "нэр"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, fuzzy, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  --list         - боломжтой багцуудын жагсаалт.\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, fuzzy, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "Нээх"
 
-#: ../urpmq:160
-#, fuzzy, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "Тодорхойгүй с"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: rpm файлыг уншиж чадахгүй \"%s\"\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, fuzzy, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "жигсаалт"
 
 #, fuzzy
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "Тодорхойгүй с"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "wget байхгүй байна\n"
+
+#, fuzzy
+#~ msgid "curl is missing\n"
+#~ msgstr "бол"
+
+#, fuzzy
+#~ msgid "rsync is missing\n"
+#~ msgstr "бол"
+
+#, fuzzy
+#~ msgid "ssh is missing\n"
+#~ msgstr "бол"
+
+#, fuzzy
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "Тодорхойгүй с"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpmi: үл мэдэгдэх сонголт \"-%s\", хэрэглэх зааврыг --help гэж үзнэ үү!\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr "тийш МБ"
+
+#, fuzzy
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr "с<relative path of hdlist>"
+
+#, fuzzy
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "с\n"
+#~ "<relative path of hdlist>"
+
+#, fuzzy
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr "с г"
+
+#, fuzzy
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "Тодорхойгүй с"
+
+#, fuzzy
 #~ msgid "no webfetch (curl or wget currently) found\n"
 #~ msgstr "үгүй"
 
diff --git a/po/ms.po b/po/ms.po
index f2eb2a29..b72b16d6 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2002-03-12 16:17+0800\n"
 "Last-Translator: Yuzz <yuzz@emasonline.com>\n"
 "Language-Team: Malaysia <yuzz@emasonline.com>\n"
@@ -50,22 +50,22 @@ msgstr ""
 "Instalasi pakej automatik...\n"
 "Anda telah meminta instalasi pakej %s\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "Semua OK?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Batal"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/t) "
@@ -75,120 +75,59 @@ msgstr " (Y/t) "
 msgid "%s: command not found\n"
 msgstr "%s: arahan tidak dijumpai\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "where [options] are from\n"
 msgstr ""
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - cetak mesej bantuan ini.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr ""
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, fuzzy, c-format
 msgid "                    defaults is %s.\n"
 msgstr "  -a             - pilih semua media.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr ""
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr ""
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, fuzzy, c-format
 msgid "unable to handle protocol: %s"
 msgstr "gagal akses fail rpm [%s]"
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr ""
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "wget hilang\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget gagal: keluar dgn %d atau isyarat %d\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "curl hilang\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl gagal: keluar dgn %d atau isyarat %d\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, fuzzy, c-format
-msgid "rsync is missing\n"
-msgstr "curl hilang\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, fuzzy, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "curl gagal: keluar dgn %d atau isyarat %d\n"
-
-#: ../urpm.pm:396
-#, fuzzy, c-format
-msgid "ssh is missing\n"
-msgstr "wget hilang\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr ""
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr ""
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...gagal terambil: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "ralat sinteks dlm fail konfigurasi pada baris %s"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -197,219 +136,219 @@ msgstr ""
 "gagal guna media \"%s\" sbg senarai fail kerana telah digunakan oleh media "
 "lain"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr "\"%s\" telah dipakai, tidak dapat digunakan utk media tak bernama"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr "media \"%s\" tidak terpakai kerana senarai fail [%s] tiada"
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "gagal tentukan media fail hdlist [%s] ini"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "gagal mengakses fail hdlist \"%s\", media diabaikan"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "gagal mengakses fail list \"%s\", media diabaikan"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "cuba lepaslalu media sedia ada\"%s\", abaikan"
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, fuzzy, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
 "ignored"
 msgstr "gagal temui fail hdlist \"%s\", media diabaikan"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "gagal temui fail hdlist \"%s\", media diabaikan"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "gagal cari fail daftar \"%s\", media diabaikan"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "ketidaksinambungan senarai fail \"%s\", media diabaikan"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "gagal periksa senarai fail \"%s\", media diabaikan"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "terlalu banyak titik sambung utk media removable \"%s\""
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "ambil peranti removable sbg \"%s\""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "pakai removable peranti lain [%s] untuk \"%s\""
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "tidak dapat mengambil nama path utk media removable \"%s\""
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "gagal tulis fail konfigurasi [%s]"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "tulis fail konfigurasi [%s]"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, fuzzy, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "gagal akses fail rpm [%s]"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, fuzzy, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "periksa baca fail hdlist [%s]"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr ""
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr ""
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, fuzzy, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "gagal kemaskini media \"%s\"\n"
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
 "update or --parallel"
 msgstr ""
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "periksa file sintesis [%s]"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "periksa baca fail hdlist [%s]"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, fuzzy, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "media \"%s\" tidak dipilih"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, fuzzy, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "bangunkan fail sintesis hdlist utk media \"%s\""
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr ""
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, fuzzy, c-format
 msgid "skipping package %s"
 msgstr "tiada pakej bernama %s"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr ""
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, fuzzy, c-format
 msgid "unable to open rpmdb"
 msgstr "gagal kemaskini media \"%s\"\n"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "media \"%s\" telah ada"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr ""
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "media %s ditambahkan"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "gagal mengakses media instalasi pertama"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "sedang menyalin fail hdlist..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, fuzzy, c-format
 msgid "...copying failed"
 msgstr "...salin selesai"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "...salin selesai"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
@@ -418,43 +357,49 @@ msgstr ""
 "gagal mengakses media instalasi pertama (fail Mandrake/base/hdlists tidak "
 "dijumpai)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "ambil fail hdlist..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "...capaian selesai"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...gagal terambil: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "deskripsi hdlist yang tidak sah \"%s\" dalam fail hdlist"
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, fuzzy, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "cuba lepaslalu media sedia ada\"%s\", abaikan"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr ""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "hapus media \"%s\""
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -462,372 +407,387 @@ msgid ""
 "medium."
 msgstr ""
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
 "ignored"
 msgstr ""
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "fail deskripsi \"%s\" sedang disalin"
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, fuzzy, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "sedang menyalin sumber/sintesis hdlist \"%s\"..."
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, fuzzy, c-format
 msgid "examining MD5SUM file"
 msgstr "periksa baca fail hdlist [%s]"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "sedang menyalin sumber/sintesis hdlist \"%s\"..."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, fuzzy, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "sedang menyalin sumber/sintesis hdlist \"%s\"..."
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr ""
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, fuzzy, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "bangunkan fail sintesis hdlist utk media \"%s\""
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, fuzzy, c-format
 msgid "reading rpm files from [%s]"
 msgstr "tiada fail rpm dijumpai dari [%s]"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, fuzzy, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "gagal baca fail rpm [%s] dari media \"%s\""
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "tiada fail rpm dijumpai dari [%s]"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "mencapai hdlist sumber (atau sintesis) \"%s\"..."
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, fuzzy, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "sedang menyalin sumber/sintesis hdlist \"%s\"..."
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "gagal mengambil hdlist (atau sintesis) source"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr ""
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "gagal mengambil hdlist (atau sintesis) source"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "fail hdlist utk media \"%s\" tak dijumpai"
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "gagal mengolah fail hdlist \"%s\""
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "gagal baca senarai fail \"%s\""
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, fuzzy, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "fail hdlist utk media \"%s\" tak dijumpai"
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "tiada yg ditulis dalam fail daftar \"%s\""
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, fuzzy, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "fail deskripsi \"%s\" sedang disalin"
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, fuzzy, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "gagal baca senarai fail \"%s\""
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, fuzzy, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "hapus media \"%s\""
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "bangun hdlist [%s]"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "bangunkan fail sintesis hdlist utk media \"%s\""
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "menemui %d header dalam kache"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "hapus %d header usang dlm kache"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "mounting %s"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "unmount %s"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "%s kemasukan di depslist direlokasikan"
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "tiada masukan direlokasikan dlm depslist"
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "nama fail rpm [%s] tidak sah"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, fuzzy, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "ambil fail hdlist..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "gagal akses fail rpm [%s]"
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, fuzzy, c-format
 msgid "unable to register rpm file"
 msgstr "gagal akses fail rpm [%s]"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "ralat pendaftaran pakej setempat"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "tiada pakej bernama %s"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Pakej berikut mengandungi %s: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "banyak pakej dgn nama fail rpm sama \"%s\""
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, fuzzy, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "gagal baca fail rpm [%s] dari media \"%s\""
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
 "  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr ""
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "pakej %s tidak dijumpai."
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "database urpmi terkunci"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "media \"%s\" tidak dipilih"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "gagal baca fail rpm [%s] dari media \"%s\""
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "media ketidaksinambungan \"%s\" bertanda removable, seharusnya tidak"
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "gagal akses media \"%s\""
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "input cacat: [%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, fuzzy, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "gagal baca fail rpm [%s] dari media \"%s\""
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr ""
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr ""
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, fuzzy, c-format
 msgid "unable to create transaction"
 msgstr "gagal membuat media \"%s\"\n"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, fuzzy, c-format
 msgid "removing package %s"
 msgstr "hapus media \"%s\""
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, fuzzy, c-format
 msgid "unable to remove package %s"
 msgstr "tidak dapat mengambil pakej asal, batal"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr ""
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, fuzzy, c-format
 msgid "unable to install package %s"
 msgstr "Hanya superuser yang boleh menginstal pakej"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, fuzzy, c-format
 msgid "due to missing %s"
 msgstr "curl hilang\n"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr ""
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr ""
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr ""
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr ""
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr ""
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr ""
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr ""
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr ""
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr ""
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: tidak dapat membaca fail rpm \"%s\"\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Salah pilih, cuba lagi\n"
+
+#: ../urpme:36
 #, fuzzy, c-format
 msgid ""
 "urpme version %s\n"
@@ -844,112 +804,102 @@ msgstr ""
 "\n"
 "penggunaan:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - cetak mesej bantuan ini.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, fuzzy, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  -a             - pilih semua yg sama dgn baris perintah.\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - paksa instal meskipun beberapa pakej tiada.\n"
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, fuzzy, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --wget         - guna wget utk mengambil fail jauh.\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - mod verbos.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, fuzzy, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - pilih semua yg sama dgn baris perintah.\n"
 
-#: ../urpme:68
-#, fuzzy, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: pilihan \"-%s\" tidak dikenali, periksa penggunaan dgn --help\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, fuzzy, c-format
 msgid "unknown packages"
 msgstr "tiada pakej bernama %s"
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr ""
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr ""
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr ""
 
-#: ../urpme:107
+#: ../urpme:99
 #, fuzzy, c-format
 msgid "Checking to remove the following packages"
 msgstr "Salah satu pakej berikut diperlukan:"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr "Pakej berikut akan dihapus agar syarat kebergantungan dipenuhi (%d MB)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (y/T) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, fuzzy, c-format
 msgid "removing %s"
 msgstr "mounting %s"
 
-#: ../urpme:123
+#: ../urpme:115
 #, fuzzy, c-format
 msgid "Removing failed"
 msgstr "...gagal terambil: %s"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Salah pilih, cuba lagi\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, fuzzy, c-format
 msgid ""
 "urpmf version %s\n"
@@ -965,38 +915,38 @@ msgstr ""
 "\n"
 "penggunaan:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - guna hanya kemaskini media.\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, fuzzy, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --update       - guna hanya kemaskini media.\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, fuzzy, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  -v             - mod verbos.\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1004,148 +954,148 @@ msgid ""
 "                   line, incompatible with interactive mode).\n"
 msgstr ""
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, fuzzy, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  -P             - jangan cari dalam tersedia utk mencari pakej.\n"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, fuzzy, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --help         - cetak mesej bantuan ini.\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, fuzzy, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --help         - cetak mesej bantuan ini.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, fuzzy, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --help         - cetak mesej bantuan ini.\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, fuzzy, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --help         - cetak mesej bantuan ini.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr ""
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr ""
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr ""
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr ""
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr ""
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, fuzzy, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --help         - cetak mesej bantuan ini.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr ""
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr ""
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, fuzzy, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --help         - cetak mesej bantuan ini.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr ""
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr ""
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
 msgstr ""
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, fuzzy, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr "  -c             - bersihkan direktori kache header.\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - cetak versi, keluaran dan arch dgn nama.\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, fuzzy, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -c             - bersihkan direktori kache header.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, fuzzy, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  -f             - paksa buat fail hdlist.\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, fuzzy, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr "  -a             - pilih semua yg sama dgn baris perintah.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
 "%s\n"
 msgstr ""
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1162,32 +1112,32 @@ msgstr ""
 "\n"
 "penggunaan:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr ""
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that leads to remove.\n"
 msgstr ""
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1195,106 +1145,106 @@ msgid ""
 "                   default is %d.\n"
 msgstr ""
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - lakukan pencarian fuzzy (sama dengan -y).\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - pakej berikut adalah pakej sumber (sama dgn -s).\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, fuzzy, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --noclean      - jaga rpm tidak dipakai dalam kache.\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - jaga rpm tidak dipakai dalam kache.\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - guna wget utk mengambil fail jauh.\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - guna curl utk mengambil fail jauh.\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
 msgstr ""
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
 msgstr ""
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - guna antaramuka X.\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1303,81 +1253,70 @@ msgstr ""
 "  --best-output  - pilih antaramuka terbaik menurut persekitaran:\n"
 "                   X atau mode teks.\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr ""
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - pilih semua yg sama dgn baris perintah.\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - izinkan carian dlm sediaada utk mencari pakej.\n"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - jangan cari dalam tersedia utk mencari pakej.\n"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - lakukan pencarian fuzzy (sama dengan --fuzzy).\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 "  -s             - pakej berikut adalah pakej sumber (sama dgn --src).\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - mod diam.\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, fuzzy, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  dicarikan nama atau fail rpm yg tertera pada baris perintah.\n"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr ""
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr ""
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: pilihan \"-%s\" tidak dikenali, periksa penggunaan dgn --help\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1390,22 +1329,22 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr ""
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr ""
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr ""
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1415,66 +1354,66 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, fuzzy, c-format
 msgid "Install it"
 msgstr "Instalasi gagal"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr ""
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr ""
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Hanya superuser yang boleh menginstal pakej"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "Salah satu pakej berikut diperlukan utk instalasi %s:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Salah satu pakej berikut diperlukan:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Pilihan Anda? (1-%d) "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr ""
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "Persediaan..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr ""
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1482,22 +1421,22 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
 msgstr ""
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
 "Pakej berikut akan diinstal agar syarat kebergantungan dipenuhi (%d MB)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1506,37 +1445,47 @@ msgstr ""
 "Anda perlu menjadi root utk install kebergantungan berikutnya:\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "tidak dapat mengambil pakej asal, batal"
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Masukkan media \"%s\" ke peranti [%s]"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr ""
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, fuzzy, c-format
 msgid "Downloading package `%s'..."
 msgstr "Install pakej `%s' (%s/%s)..."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr ""
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr ""
+
+#: ../urpmi:606
 #, fuzzy, c-format
 msgid "The following packages have bad signatures"
 msgstr "Pakej berikut mengandungi %s: %s"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr ""
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1544,57 +1493,57 @@ msgid ""
 "You may want to update your urpmi database"
 msgstr ""
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "Instalasi gagal"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, fuzzy, c-format
 msgid "distributing %s"
 msgstr "instal %s\n"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, fuzzy, c-format
 msgid "installing %s"
 msgstr "instal %s\n"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Install pakej `%s' (%s/%s)..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Cuba instalasi tanpa periksa kebergantungan? (y/T) "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Cuba instalasi lebih keras (--force)? (y/T) "
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "Instalasi gagal"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, fuzzy, c-format
 msgid "Installation is possible"
 msgstr "Instalasi gagal"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "semua telah diinstal"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr ""
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1618,36 +1567,36 @@ msgstr ""
 "\n"
 "dan [pilihan] dari\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - buat media update.\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
 "                   hdlist file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1655,14 +1604,14 @@ msgid ""
 "                   anything else that has been configured ;-)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr ""
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1670,85 +1619,66 @@ msgid ""
 "                   installed mandrake-release package.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
 "                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - bersihkan direktori kache header.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - paksa buat fail hdlist.\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"pilihan tidak diketahui '%s'\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, fuzzy, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "ambil fail hdlist..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"tak perlu memberikan <path relatif hdlist> dgn --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "tak perlu memberikan <path relatif hdlist> dgn --distrib"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "gagal kemaskini media \"%s\"\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"<path relatif hdlist> hilang\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<path relatif hdlist> hilang\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
+msgid "`with' missing for network media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "gagal membuat media \"%s\"\n"
@@ -1767,6 +1697,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - pilih semua media.\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"pilihan tidak diketahui '%s'\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1781,7 +1720,7 @@ msgstr ""
 "masukan utk penghapusan hilang\n"
 "(satu dari %s)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1790,28 +1729,28 @@ msgstr ""
 "penggunaan: urpmi.update [pilihan] <nama> ...\n"
 "<nama> adalah media yg akan dikemaskini.\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, fuzzy, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - guna hanya kemaskini media.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr ""
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - pilih semua media non-removable.\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "tiada apa-apa yang perlu dikemaskini (guna urpmi.addmedia utk tambah media)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1820,7 +1759,7 @@ msgstr ""
 "masukan kemaskini hilang\n"
 "(satu dari %s)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1836,38 +1775,38 @@ msgstr ""
 "\n"
 "penggunaan:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, fuzzy, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --src          - pakej berikut adalah pakej sumber (sama dgn -s).\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr ""
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr ""
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr ""
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
@@ -1876,31 +1815,31 @@ msgstr ""
 "  --headers      - keluarkan header senarai pakej  dari dalam db urpmi ke\n"
 "                   stdout (hanya root).\n"
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 "  --sources      - beri semua pakej sumber sebelum muatturun (hanya root).\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, fuzzy, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --help         - cetak mesej bantuan ini.\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - tambah pencarian ke kebergantungan pakej.\n"
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, fuzzy, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -1908,52 +1847,98 @@ msgid ""
 msgstr ""
 "  -s             - pakej berikut adalah pakej sumber (sama dgn --src).\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, fuzzy, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -d             - tambah pencarian ke kebergantungan pakej.\n"
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, fuzzy, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -p             - izinkan carian dlm sediaada utk mencari pakej.\n"
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, fuzzy, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -f             - paksa buat fail hdlist.\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, fuzzy, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -f             - cetak versi, keluaran dan arch dgn nama.\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, fuzzy, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -f             - cetak versi, keluaran dan arch dgn nama.\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, fuzzy, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -p             - izinkan carian dlm sediaada utk mencari pakej.\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  dicarikan nama atau fail rpm yg tertera pada baris perintah.\n"
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: pilihan asing \"-%s\", periksa pemakaian dgn --help\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: tidak dapat membaca fail rpm \"%s\"\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr ""
+
+#~ msgid "wget is missing\n"
+#~ msgstr "wget hilang\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "wget gagal: keluar dgn %d atau isyarat %d\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "curl hilang\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "curl gagal: keluar dgn %d atau isyarat %d\n"
+
+#, fuzzy
+#~ msgid "rsync is missing\n"
+#~ msgstr "curl hilang\n"
+
+#, fuzzy
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "curl gagal: keluar dgn %d atau isyarat %d\n"
+
+#, fuzzy
+#~ msgid "ssh is missing\n"
+#~ msgstr "wget hilang\n"
+
+#, fuzzy
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpmi: pilihan \"-%s\" tidak dikenali, periksa penggunaan dgn --help\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpmi: pilihan \"-%s\" tidak dikenali, periksa penggunaan dgn --help\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr ""
+#~ "Pakej berikut akan diinstal agar syarat kebergantungan dipenuhi (%d MB)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "tak perlu memberikan <path relatif hdlist> dgn --distrib"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "<path relatif hdlist> hilang\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmq: pilihan asing \"-%s\", periksa pemakaian dgn --help\n"
diff --git a/po/mt.po b/po/mt.po
index 2b1618c4..d6946e23 100644
--- a/po/mt.po
+++ b/po/mt.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-mt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2003-09-13 06:18+0200\n"
 "Last-Translator: Ramon Casha <rcasha@waldonet.net.mt>\n"
 "Language-Team:  <mt@li.org>\n"
@@ -52,22 +52,22 @@ msgstr ""
 "Installazzjoni awtomatika ta' pakketti...\n"
 "Int tlabt l-installazzjoni tal-pakkett %s\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "Tajjeb?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Ikkanċella"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (I/l) "
@@ -77,120 +77,59 @@ msgstr " (I/l) "
 msgid "%s: command not found\n"
 msgstr "%s: kmand ma nstabx\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "where [options] are from\n"
 msgstr ""
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - uri dan il-messaġġ ta' għajnuna.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, fuzzy, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "  --group         - uri l-grupp.\n"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, fuzzy, c-format
 msgid "                    defaults is %s.\n"
 msgstr "  --list         - uri l-pakketti disponibbli kollha.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "\"webfetch\" mhux magħruf `%s' !!!\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "protokoll mhux magħruf definit għal %s"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "ma nistax nuża l-protokoll: %s"
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "ikkupjar falla: %s"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "wget m'hux installat\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget falla: ħareġ b' %d jew sinjal %d\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "curl ma jeżistix\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl falla: ħareġ b' %d jew sinjal %d\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "resync ma jeżistix\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "rsync falla: ħareġ b' %d jew sinjal %d\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "ssh m'hux installat\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% ta' %s lest, ħin = %s, rata = %s"
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% lest, rata = %s"
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...qari falla: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "żball sintattiku fil-fajl ta' konfigurazzjoni, fuq linja %s"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr "sors \"%s\" qed jipprova juża hdlist li diġà użat, sors injorat"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr "is-sors \"%s\" jipprova juża lista diġà użata, sors injorat"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -199,38 +138,38 @@ msgstr ""
 "ma nistax nieħu ħsieb is-sors \"%s\" peress li l-fajl tal-lista diġà qed "
 "jintuża minn sors ieħor"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr "ma nistax nuża l-isem \"%s\" għas-sors għax diġà qed jintuża"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 "ma nistax nuża s-sors \"%s\" peress li ma jeżistix fajl ta' lista \"%s\""
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "ma nistax niddetermina s-sors ta' dan il-fajl hdlist [%s]"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "ma nistax naċċessa l-fajl hdlist ta' \"%s\", sors injorat"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "ma nistax naċċessa l-fajl tal-lista \"%s\", sors injorat"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "qed nipprova naqbeż is-sors eżistenti \"%s\""
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -239,92 +178,92 @@ msgstr ""
 "sors virtwali \"%s\" ma jistax ikollu hdlist jew fajl ta' lista definit; "
 "sors injorat"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "is-sors virtwali \"%s\" għandu jkollu url ċar; sors injurat"
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "ma nistax insib il-fajl hdlist għal \"%s\", sors injorat"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "ma nistax insib il-fajl tal-lista għal \"%s\", sors injorat."
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "fajl tal-lista ta' \"%s\" ma jinftehimx, sors injorat"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "ma nistax jispezzjona l-fajl tal-lista għal \"%s\", sors injorat"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "wisq punti ta' mmuntar għas-sors li jitneħħa \"%s\""
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "qed nieħu l-apparat li jitneħħa bħala \"%s\""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "qed jintuża apparat [%s] għal \"%s\""
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "ma nistax nikseb il-path għal sors li jitneħħa \"%s\""
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "ma setax jinkiteb il-fajl ta' konfigurazzjoni [%s]"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "ikteb fajl ta' konfigurazzjoni [%s]"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "ma nistax nifli \"%s\" fil-fajl [%s]"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "qed jiġi eżaminat \"parallel handler\" fil-fajl [%s]"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "instab \"parallel handler\" għal nodi: %s"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "qed tintuża medja assoċjata għal modalità parallela: %s"
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "ma nistax nuża għażla parallela \"%s\""
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -333,90 +272,90 @@ msgstr ""
 "--synthesis ma jistax jintuża ma' --media, --excludemedia, --sortmedia,  --"
 "update jew --parallel"
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "qed jiġi eżaminat il-fajl ta' sinteżi [%s]"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "qed jiġi eżaminat il-fajl hdlist [%s]"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "sors virtwali \"%s\" mhux lokali; sors injorat"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "problema fil-qari tal-hdlist jew sinteżi għas-sors \"%s\""
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "Qed ngħaddi t-tieni passata biex niddetermina dipendenzi\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "qed jinqabeż pakkett %s"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "jaġġorna minflok jinstalla pakkett %s"
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "ma nistax niftaħ rpmdb"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "sors \"%s\" diġà jeżisti"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr "sors virtwali jrid ikun lokali"
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "ġie miżjud is-sors %s"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "ma nistax naċċessa l-ewwel sors ta' installazzjoni"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "qed nikkopja l-fajl hdlist..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "...ikkupjar falla"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "...ikkupjar lest"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
@@ -425,43 +364,49 @@ msgstr ""
 "ma nistax naċċessa l-ewwel sors ta' installazzjoni (ma nstabx il-fajl "
 "Mandrake/base/hdlists)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "qed naqra l-fajl \"hdlists\"..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "...qari lest"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...qari falla: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "deskrizzjoni tal-hdlist \"%s\" invalida fil-fajl hdlist"
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "qed nipprova naċċessa sors ineżistenti \"%s\""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "qed nagħżel sors multiplu: %s"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "qed jitneħħa s-sors \"%s\""
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -472,7 +417,7 @@ msgstr ""
 "dan jista' jiġri jekk timmonta d-direttorju manwalment waqt li qed jinħoloq "
 "is-sors."
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -480,223 +425,223 @@ msgid ""
 msgstr ""
 "sors virtwali \"%s\" għandu jkollu hdlist jew sinteżi validu, sors injorat"
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "qed nikkopja l-fajl ta' deskrizzjoni ta' \"%s\""
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr ""
 "qed tiġi kalkulata l-md5sum ta l-hdlist (jew sinteżi) tas-sors eżistenti"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "qed jiġi eżaminat il-fajl MD5SUM"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "qed nikkopja l-hdlist (jew sinteżi) sors ta' \"%s\"..."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "qed nikkalkula md5sum tal-hdlist jew sinteżi kkupjat"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, fuzzy, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "ikkupjar ta' [%s] falla"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "problema fil-qari tas-sinteżi għas-sors \"%s\""
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "qed jinqraw fajls rpm minn [%s]"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "ma setgħux jinqraw l-fajls rpm minn [%s]: %s"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "ebda fajls rpm ma nstabu minn [%s]"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "qed jinġab l-hdlist jew sinteżi sors għal \"%s\"..."
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "sibt l-hdlist (jew sinteżi) bħala %s"
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "qed tiġi kalkulata l-md5sum għall-hdlist jew sinteżi tas-sors imniżżel"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr "md5sum ma qablitx"
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "il-qari tal-hdlist jew sinteżi sors falla."
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "ma nstabx fajl hdlists għas-sors \"%s\""
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "fajl [%s] diġà użat fl-istess medjum \"%s\""
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "ma nistax nifli l-fajl hdlist ta' \"%s\""
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "ma nistax nikteb il-fajl tal-lista \"%s\""
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "qed jinkiteb il-fajl b'lista għas-sors \"%s\""
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "ma nkiteb xejn fil-lista għal \"%s\""
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "qed jiġi eżaminat fajl pubkey ta' \"%s\"..."
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...ċifrarju %s importat mill-fajl pubkey ta' \"%s\""
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "ma stajtx nimporta fajl pubkey ta' \"%s\""
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "qed naqra l-\"headers\" mis-sors \"%s\""
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "qed jinbena hdlist [%s]"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "ibni l-fajl ta' sintesi tal-hdlist għas-sors \"%s\""
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "instabu %d headers fil-cache"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "qed inneħħi %d headers antiki mill-cache"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "qed jiġi mmuntat %s"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "qed niżmonta %s"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "%s elementi relokati f' depslist"
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "ebda element relokat f' deplist"
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "isem tal-fajl rpm [%s] invalidu"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "qed jinġab il-fajl rpm [%s] ..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "ma nistax naċċessa l-fajl rpm [%s]"
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "ma nistax nirreġistra l-fajl rpm"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "problema fir-reġistrazzjoni ta' pakketti lokali"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "ebda pakkett imsejjaħ %s"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Dawn il-pakketti fihom %s: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "hemm diversi pakketti bl-istess isem ta' rpm \"%s\""
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "ma nistax nifli sew [%s] fuq il-valur \"%s\""
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -705,143 +650,158 @@ msgstr ""
 "sors \"%s\" juża lista ta' fajls invalida:\n"
 "  mera aktarx mhux aġġornata; se nipprova mod ieħor"
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "sors \"%s\" ma jiddefinixxi ebda lokazzjoni tal-fajls rpm"
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "pakkett %s ma nstabx."
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "database urpmi imsakkar"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "sors \"%s\" mhuwiex magħżul"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "ma nistax naqra l-rpm [%s] mis-sors \"%s\""
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "sors \"%s\" immarkat li jista' jitneħħa, imma m'hux"
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "ma nistax naċċessa s-sors \"%s\""
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "input iffurmat ħażin [%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "qed jinġabu l-fajls rpm mis-sors \"%s\"..."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "Qed nipprepara..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "qed jintuża l-proċess %d biex jagħmel tranżazzjoni"
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr "qed tinħoloq tranżazzjoni għal %s (neħħi=%d, installa=%d, aġġorna=%d)"
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr "ma nistax noħloq tranżazzjoni"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "ed jitneħħa l-pakkett %s"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "ma nistax inneħħi l-pakkett %s"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "qed jiġi miżlud pakkett \"%s\" (id=%d eid=%d, aġġorna=%d, fajl=%s)"
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "ma nistax ninstalla l-pakkett %s"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "minħabba %s nieqes"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "minħabba %s mhux sodisfatt"
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr "qed nipprova nippromwovi %s"
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr "sabiex inżomm %s"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "sabiex ninstalla %s"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "minħabba konflitt ma' %s"
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr "mhux mitlub"
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Firma invalida (%s)"
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "ID taċ-ċifrarju invalidu (%s)"
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Firma nieqsa (%s)"
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "dikjarazzjoni ta' \"proxy\" ħażina fil-linja ta' kmand\n"
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: ma nistax naqra l-fajl rpm \"%s\"\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Għażla ħażina, jiddispjaċini. Erġa' pprova\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -858,114 +818,104 @@ msgstr ""
 "\n"
 "użu:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - uri dan il-messaġġ ta' għajnuna.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - agħżel pakkett awtomatikament fl-għażla.\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr "  --test         - ivverifika li l-installazzjoni tista' ssir sew.\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 "  --force        - imponi l-invokazzjoni anke jekk xi pakketti ma jeżistux.\n"
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - iddistribwixxi urpmi fuq il-magni ta' alias.\n"
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, fuzzy, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --curl         - uża curl biex iġġib fajls remoti.\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - modalità b'ħafna dettalji (verbose).\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - agħżel kull ma jaqbel fuq il-linja tal-kmand.\n"
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: għażla \"-%s\" mhux magħrufa, iċċekkja l-użu b' --help\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr "pakketti mhux magħrufa"
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "pakkett mhux magħruf"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "jekk tneħħi l-pakkett %s is-sistema ma tibqax taħdem sew"
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr "M'hemm xejn x'inneħħi"
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "Qed niċċekkja biex jitneħħa wieħed minn dawn il-pakketti"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
 "Biex nissodisfa d-dipendenzi, dawn il-pakketti jridu jitneħħew ukoll (%d MB)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (i/L) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "qed jitneħħa %s"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr "Tneħħija falliet"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Għażla ħażina, jiddispjaċini. Erġa' pprova\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -982,38 +932,38 @@ msgstr ""
 "\n"
 "użu:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - uża s-sorsi ta' aġġornament biss.\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - uża biss is-sorsi llistjati b'virgoli.\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - eskludi s-sorsi msemmija, separati b'virgoli.\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr "  --synthesis    - uża s-sinteżi mogħti minflok id-database urpmi.\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  -verbose       - modalità b'ħafna dettalji.\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1024,87 +974,87 @@ msgstr ""
 "tag,\n"
 "                   inkompatibbli mal-modalità interattiva).\n"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr ""
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all           - uri t-tags kollha.\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group         - uri l-grupp.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size          - uri d-daqs.\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr ""
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary       - uri sommarju.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description   - uri deskrizzjoni\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr ""
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr ""
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr ""
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --url          - uri l-url.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr "  --provides      - uri \"provides\" - kull ma jipprovdi\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr "  --requires      - uri \"requires\": kull ma jeħtieġ\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files         - uri \"files\": il-files kollha\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr "  --conflicts     - uri \"conflicts\": kull ma joħloq konflitt\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr "  --obsoletes     - ipprintja l-kontenut ta' \"obsoletes\"\n"
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
@@ -1112,51 +1062,51 @@ msgid ""
 msgstr ""
 "  --env          - uża ambjent speċifiku (tipikament f'rapport ta' bug).\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr "  -i             - qis ittri kbar u żgħar l-istess f'kull mudell.\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - uri verżjoni, ħarġa u arkitettura flimkien ma' l-isem.\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - includi kodiċi perl direttament bħala perl -e.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 "  -o             - operatur OR binarju: veru jekk espressjoni minnhom veru.\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
@@ -1165,12 +1115,12 @@ msgstr ""
 "callback huwa :\n"
 "%s\n"
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "qed jintuża ambjent speċifiku fuq %s\n"
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1187,26 +1137,26 @@ msgstr ""
 "\n"
 "użu:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - uża s-sinteżi mogħti minflok id-database urpmi.\n"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 "  --auto-select  - agħżel pakketti awtomatikament biex taġġorna s-sistema.\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr ""
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1216,7 +1166,7 @@ msgstr ""
 "existing packages if possible, reject requested\n"
 "                   packages that leads to remove.\n"
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1224,40 +1174,40 @@ msgid ""
 "                   default is %d.\n"
 msgstr ""
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - imponi tfittix \"fuzzy\" (l-istess bħal -y).\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 "  --src          - il-pakkett li jmiss huwa pakkett sors (l-istess bħal -"
 "s).\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 "  --install-src  - installa biss pakketti bis-sorsi (mingħajr binarji).\n"
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - neħħi rpms mill-cache qabel affarijiet oħra.\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - żomm rpms mhux użati fil-cache.\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1266,7 +1216,7 @@ msgstr ""
 "  --allow-nodeps - ippermetti li l-user jiġi mistoqsi jekk iridx jinstalla\n"
 "                   pakketti mingħajr ma jiġu ċċekkjati d-dipendenzi.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1276,29 +1226,29 @@ msgstr ""
 "                   pakketti mingħajr ma jiġu ċċekkjati d-dipendenzi \n"
 "                   u integrità.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - uża wget biex iġġib fajls remoti.\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - uża curl biex iġġib fajls remoti.\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - illimita r-rata ta' tniżżil.\n"
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, fuzzy, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1307,7 +1257,7 @@ msgstr ""
 "  --verify-rpm   - ivverifika l-firma tal-pakkett qabel tinstalla.\n"
 "                   (--no-verify-rpm itfih, impliċitament mixgħul).\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1318,7 +1268,7 @@ msgstr ""
 "                   li huwa 1080 impliċitament (format huwa <proxyhost[:port]"
 ">).\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1328,7 +1278,7 @@ msgstr ""
 "awtentikazzjoni\n"
 "                   tal-proxy (format huwa <user:password>).\n"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1337,12 +1287,12 @@ msgstr ""
 "  --bug          - ipproduċi rapport ta' bug fid-direttorju indikat "
 "fl-                   argument li jmiss.\n"
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - uża l-interfaċċja X.\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1351,7 +1301,7 @@ msgstr ""
 "  --best-output  - agħżel l-aħjar interfaċċja skond l-ambjent, X jew "
 "testwali.\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1360,77 +1310,66 @@ msgstr ""
 "  --verify-rpm   - ivverifika l-firma tal-pakkett qabel tinstalla.\n"
 "                   (--no-verify-rpm itfih, impliċitament mixgħul).\n"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - eskludi direttorji separati b'virgoli.\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr ""
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - agħżel kull ma jaqbel fuq il-linja tal-kmand.\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 "  -p             - ippermetti tfittix fil-\"provides\" biex issib pakkett.\n"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - tfittixx fil-\"provides\" biex issib pakkett.\n"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 "  -y             - ġiegħel tfittix \"fuzzy\" (l-istess bħal --fuzzy).\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 "  -s             - il-pakkett li jmiss huwa sors (l-istess bħal --src).\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - modalità kwieta.\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 "  ismijiet jew fajls rpm mogħtija fuq il-linja ta' kmand se jiġu nstallati.\n"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr ""
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "dikjarazzjoni ta' \"proxy\" ħażina fil-linja ta' kmand\n"
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: għażla \"-%s\" mhux magħrufa, iċċekkja l-użu b' --help\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr "X'jista' jsir minn fajls rpm binarji meta tuża --install-src"
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1443,22 +1382,22 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "Tagħmel xejn"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr ""
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr ""
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1468,54 +1407,54 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, fuzzy, c-format
 msgid "Install it"
 msgstr "installazzjoni falliet"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr ""
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Ma nistax noħloq id-direttorju [%s] għar-rapport tal-bug"
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Is-\"superuser\" biss għandu l-awtorità jistalla pakketti"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "Wieħed minn dawn il-pakketti meħtieġa biex tinstalla %s:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Wieħed minn dawn il-pakketti huwa meħtieġ:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "X'tagħżel? (1-%d) "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "Installazzjoni ta' pakketti..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "Qed jibda..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1524,12 +1463,12 @@ msgstr ""
 "Xi pakketti mitluba ma jistgħux jiġu nstallati:\n"
 "%s"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr "taqbel?"
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1540,7 +1479,7 @@ msgstr ""
 "jitneħħew sabiex oħrajn jiġu aġġornati:\n"
 "%s\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1549,16 +1488,16 @@ msgstr ""
 "Dawn il-pakketti jridu jitneħħew qabel oħrajn jiġu aġġornati:\n"
 "%s"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
 "Biex nissodisfa d-dipendenzi, dawn il-pakketti jridu jiġu nstallati wkoll (%"
 "d MB)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1567,37 +1506,47 @@ msgstr ""
 "Trid tkun \"root\" biex tinstalla dawn id-dipendenzi:\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "ma nistax inġib il-pakketti tas-sors, se noħroġ"
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Jekk jogħġbok daħħal id-diska mmarkata \"%s\" fl-apparat [%s]"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Agħfas Enter meta tlesti..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Qed jitniżżel il-pakkett \"%s\"..."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% ta' %s lest, ħin = %s, rata = %s"
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% lest, rata = %s"
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Dawn il-pakketti fihom firem ħżiena"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Trid tkompli l-installazzjoni ?"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1609,57 +1558,57 @@ msgstr ""
 "%s\n"
 "Forsi trid taġġorna d-database urpmi"
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "installazzjoni falliet"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr "qed jiġi distribwit %s"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr "qed jiġi nstallat %s"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Qed jiġi nstallat \"%s\" (%s/%s)..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Trid tinstalla mingħajr ma niċċekkja d-dipendenzi? (i/L) "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Trid tipprova b'iżjed qawwa (--force)? (i/L)"
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d tranżazzjonijiet ta' installazzjoni fallew"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "Installazzjoni possibbli"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "kollox diġà installat"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr ""
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1684,29 +1633,29 @@ msgstr ""
 "\n"
 "u [għażliet] huma minn\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - oħloq sors ta' aġġornament.\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
 "                   hdlist file.\n"
 msgstr "  --no-probe     - tippruvax tfittex fajls sinteżi jew hdlist.\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -1714,7 +1663,7 @@ msgid ""
 msgstr ""
 "  --distrib      - oħloq is-sorsi kollha minn sors ta' installazzjoni.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1722,14 +1671,14 @@ msgid ""
 "                   anything else that has been configured ;-)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr ""
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1737,87 +1686,66 @@ msgid ""
 "                   installed mandrake-release package.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
 "                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - naddaf id-direttorju tal-cache tal-headers.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - ġiegħel il-fajls hdlist jiġu ġenerati.\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"għażla \"%s\" mhux magħrufa\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "ma jistgħux jiġu miżjuda aġġornamenti ta' distribuzzjoni \"cooker\"\n"
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "qed jinġabu mirja minn %s ..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"m'hemmx għalfejn tagħti <isem tal-hdlist relattiv> ma' --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "m'hemmx għalfejn tagħti <isem tal-hdlist relattiv> ma' --distrib"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "ma nistax naġġorna s-sors \"%s\"\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"<isem tal-hdlist relattiv> mhux speċifikat\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<isem tal-hdlist relattiv> mhux speċifikat\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"\"with\" nieqes għal sors tan-network\n"
+msgid "`with' missing for network media\n"
+msgstr "\"with\" nieqes għal sors tan-network\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "ma nistax noħloq sors \"%s\"\n"
@@ -1836,6 +1764,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - agħżel is-sorsi kollha.\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"għażla \"%s\" mhux magħrufa\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1850,7 +1787,7 @@ msgstr ""
 "l-element li trid tneħħi m'hux hemm\n"
 "(wieħed minn %s)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1859,27 +1796,27 @@ msgstr ""
 "użu: urpmi.update [għażliet] <isem> ...\n"
 "fejn <isem> huwa l-isem tas-sors x'taġġorna.\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - uża s-sorsi ta' aġġornament biss.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr ""
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - agħżel is-sorsi kollha li ma jitneħħewx.\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "m'hemm xejn x'naġġorna (uża urpmi.addmedia biex iżżid sors)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1888,7 +1825,7 @@ msgstr ""
 "l-element li trid taġġorna m'hux hemm\n"
 "(wieħed minn %s)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1905,38 +1842,38 @@ msgstr ""
 "\n"
 "użu:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - uri l-pakketti disponibbli kollha.\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - illistja l-medji disponibbli.\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, fuzzy, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-media   - illistja l-medji disponibbli.\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr "  --list-nodes   - illistja nodi disponibbli għal --parallel.\n"
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - elenka l-aliases paralleli disponibbli.\n"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
@@ -1945,7 +1882,7 @@ msgstr ""
 "  --headers      - oħroġ il-headers għall-pakkett imsemmi mid-db urpmi\n"
 "                   għal stdout (root biss).\n"
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
@@ -1953,24 +1890,24 @@ msgstr ""
 "  --sources      - agħti l-pakketti sorsi kollha qabel tniżżilhom (root "
 "biss).\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, fuzzy, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --all           - uri t-tags kollha.\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - estendi t-tfittix għad-dipendenzi tal-pakketti.\n"
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -1979,59 +1916,113 @@ msgstr ""
 "  -u             - neħħi pakkett jekk diġà hemm verżjoni iżjed riċenti "
 "nstallata.\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, fuzzy, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 "  -i             - uri informazzjoni utli f'forma li tinftiehem faċilment.\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - uri l-gruppi flimkien ma' l-isem.\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - uri verżjoni u ħarġa flimkien ma' l-isem.\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, fuzzy, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  --list         - uri l-pakketti disponibbli kollha.\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 "  ismijiet jew fajls rpm li jingħataw fuq il-linja tal-kmand jiġu "
 "spezzjonati.\n"
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: għażla \"-%s\", mhux magħrufa, iċċekkja l-użu b' --help\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: ma nistax naqra l-fajl rpm \"%s\"\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr ""
 
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "\"webfetch\" mhux magħruf `%s' !!!\n"
+
+#~ msgid "copy failed: %s"
+#~ msgstr "ikkupjar falla: %s"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "wget m'hux installat\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "wget falla: ħareġ b' %d jew sinjal %d\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "curl ma jeżistix\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "curl falla: ħareġ b' %d jew sinjal %d\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "resync ma jeżistix\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "rsync falla: ħareġ b' %d jew sinjal %d\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "ssh m'hux installat\n"
+
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpme: għażla \"-%s\" mhux magħrufa, iċċekkja l-użu b' --help\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmi: għażla \"-%s\" mhux magħrufa, iċċekkja l-użu b' --help\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr ""
+#~ "Biex nissodisfa d-dipendenzi, dawn il-pakketti jridu jiġu nstallati wkoll "
+#~ "(%d MB)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "m'hemmx għalfejn tagħti <isem tal-hdlist relattiv> ma' --distrib"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "<isem tal-hdlist relattiv> mhux speċifikat\n"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\"with\" nieqes għal sors tan-network\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmq: għażla \"-%s\", mhux magħrufa, iċċekkja l-użu b' --help\n"
+
 #~ msgid "no webfetch (curl or wget currently) found\n"
 #~ msgstr "ebda webfetch (curl jew wget bħalissa) ma nstab\n"
 
diff --git a/po/nb.po b/po/nb.po
index 626521a1..24eea8aa 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2004-03-05 20:49+0100\n"
 "Last-Translator: Per Øyvind Karlsen <peroyvind@sintrax.net>\n"
 "Language-Team: Norwegian Bokmål <nb@li.org>\n"
@@ -53,22 +53,22 @@ msgstr ""
 "Automatisk installasjon av pakker...\n"
 "Du ba om installasjon av pakke %s\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "Er dette ok?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (J/n) "
@@ -78,7 +78,7 @@ msgstr " (J/n) "
 msgid "%s: command not found\n"
 msgstr "%s: kommando ikke funnet\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
@@ -87,113 +87,52 @@ msgstr ""
 "bruk: %s [valg]\n"
 "hvor [valg] er fra\n"
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - vis denne hjelpemeldingen.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "   -g [group]     - begrens resultat til gitte gruppe.\n"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, c-format
 msgid "                    defaults is %s.\n"
 msgstr "                    standard er %s.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Ukjent webfetch `%s' !!!\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "ukjent protokoll definert for %s"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "ingen webfetch funnet, støttede webfetch er: %s\n"
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "kunne ikke håndtere protokoll: %s"
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "kopiering mislykket: %s"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "wget mangler\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget feilet: avsluttet med %d eller signal %d\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "curl mangler\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl mislykket: avsluttet med %d eller signal %d\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "rsync er borte\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "rsync mislykket: avsluttet med %d eller signal %d\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "ssh mangler\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% av %s ferdig, ETA = %s, hastighet = %s"
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% ferdig, hastighet = %s"
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...mottak mislykket: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "syntaksfeil i konfigurasjonsfil ved linje %s"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr "medium \"%s\" prøver å bruke en allerede brukt hdlist, medium ignorert"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr "medium \"%s\" prøver å bruke en allerede brukt liste, medium ignorert"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -202,39 +141,39 @@ msgstr ""
 "kan ikke ta hånd om medium \"%s\" da liste-fil allerede blir brukt av et "
 "annet medium"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 "kunne ikke bruke navn \"%s\" for navnløst medium da det allerede er brukt"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 "kunne ikke ta medium \"%s\" i betraktning da ingen liste-fil [%s] eksisterer"
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "kunne ikke bestemme medium av denne hdlist-filen [%s]"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "kunne ikke nå hdlist-fil av \"%s\", media ignorert"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "kan ikke få tilgang til liste-fil av \"%s\", medium ignorert"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "prøver å gå forbi eksisterende medium \"%s\", unngår"
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -243,92 +182,92 @@ msgstr ""
 "virtuelt medium \"%s\" skal ikke ha definert hdlist- eller list-fil, medium "
 "ignorert"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "virtuelt medium \"%s\" burde ha en klar url, medium ignorert"
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "kunne ikke finne hdlist-fil for \"%s\", media ignorert"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "kunne ikke finne liste fil for \"%s\", medium ignorert"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "usammenhengende liste-fil for \"%s\", medium ignorert"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "kunne ikke inspisere liste-fil for \"%s\", medium ignorert"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "for mange monteringspunkter for fjernbart medium \"%s\""
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "tar fjernbar enhet som \"%s\""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "bruker forskjellige fjernbare enheter [%s] for \"%s\""
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "kunne ikke motta sti for fjernbart medium \"%s\""
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "kunne ikke skrive konfigurasjonsfil [%s]"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "skriv konfigurasjonsfil [%s]"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "Kan ikke bruke parallel-modus med use-distrib-modus"
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "kunne ikke spalte \"%s\" i fil [%s]"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "sjekker parallelhåndterer i fil [%s]"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "fant parallelhåndterer for noder: %s"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "bruker assosiert media for parallelmodus: %s"
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "kunne ikke bruke parallel-valg \"%s\""
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -337,91 +276,91 @@ msgstr ""
 "--synthesis kan ikke brukes med --media, excludemedia, --sortmedia, --update "
 "eller --parallel"
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "sjekker syntese-fil [%s]"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "sjekker hdlist-fil [%s]"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "virtuelt medium \"%s\" er ikke lokalt, medium ignorert"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "problem med å lese syntese-fil av medium \"%s\""
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "utfører andre rundgang for å beregne avhengigheter\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "hopper over pakke %s"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "ville installert i stedet for å oppgradere pakke %s"
 
 #
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "kunne ikke åpne rpmdb"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "medium \"%s\" eksisterer allerede"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr "virtuelt medium trenger å være lokalt"
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "lagt til medium %s"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "kan ikke få tilgang til første installasjonsmedium"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "kopierer hdlists-fil..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "...kopiering feilet"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "...kopiering ferdig"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
@@ -430,43 +369,49 @@ msgstr ""
 "kan ikke få adgang til første installasjonsmedium (ingen Mandrake/base/"
 "hdlists-fil funnet)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "mottar hdlists-fil..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "...ferdig mottatt"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...mottak mislykket: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "invalid hdlist beskrivelse \"%s\" i hdlists-filen"
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "prøver å velge ikke-eksisterende medium \"%s\""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "velger flere media: %s"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "fjerner medium \"%s\""
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -477,7 +422,7 @@ msgstr ""
 "dette kan ha skjedd hvis du monterte katalogen manuelt når mediumet ble "
 "opprettet."
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -486,222 +431,222 @@ msgstr ""
 "virtuelt medium \"%s\" burde ha en gyldig kildehdlist eller syntese, medium "
 "ignorert"
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "kopierer beskrivelsesfil av \"%s\"..."
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "regner ut md5sum av eksisterende kildehdlist(eller syntese)"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "kontrollerer MD5SUM-fil"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "kopierer kildehdlist (eller syntese) av \"%s\"..."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "kopiering av [%s] mislykket (fil er mistenkelig liten)"
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "regner ut md5sum av kopierte kildehdlist (eller syntese)"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "kopiering av [%s] mislykket (md5sum stemmer ikke)"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "problem med å lese syntese-fil av medium \"%s\""
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "leser rpm-filer fra [%s]"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "kunne ikke lese rpm-filer fra [%s]: %s"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "ingen rpm-filer funnet fra [%s]"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "mottar kildehdlist (eller syntese) av \"%s\"..."
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "fant test hdlist (eller syntese) som %s"
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "regner ut md5sum av mottatte kildehdlist (eller syntese)"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr "md5sum stemmer ikke overens"
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "mottak av kilde hdlist (eller syntese) mislykket"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "ingen hdlist-fil funnet for medium \"%s\""
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "filen [%s] er allerede brukt i det samme mediumet \"%s\""
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "ikke i stand til å tolke hdlist fil av  \"%s\""
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "kunne ikke skrive liste-fil av \"%s\""
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "skriver listefil for medium \"%s\""
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "ingenting skrevet i liste-fil for \"%s\""
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "mottar offentlignøkkel-fil med beskrivelse av \"%s\"..."
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...importerer nøkkel %s fra offentlignøkkel-fil av \"%s\""
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "kunne ikke importere offentlignøkkel-fil av \"%s\""
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "leser hoder fra medium \"%s\""
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "bygger hdlist [%s]"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "bygd hdlist syntese-fil for medium \"%s\""
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "fant %d hoder i cache"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "fjerner %d foreldede hoder fra cache"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "monterer %s"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "demonterer %s"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "fant igjen %s oppføringer i depsliste"
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "ingen oppføringer funnet igjen i depsliste"
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "ugyldig rpm-filnavn [%s]"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "mottar rpm-fil [%s] ..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "kunne ikke nå rpm-fil [%s]"
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "ikke i stand til å registrere rpm-fil"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "feil ved registrering av lokale pakker"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "ingen pakke kalt %s"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Følgende pakker inneholder %s: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "det er flere pakker med samme rpm-filnavn \"%s\""
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "kunne ikke korrekt tolke [%s] på verdi \"%s\""
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -711,62 +656,62 @@ msgstr ""
 "  speilet er sannsynligvis ikke oppdatert, prøver å bruke en alternativ "
 "metode"
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "medium \"%s\" definerer ikke noen lokasjon for rpm-filer"
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "pakke %s er ikke funnet."
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi-database låst"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "medium \"%s\" er ikke valgt"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "kunne ikke lese rpm-fil [%s] fra medium \"%s\""
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "usammenhengende medium \"%s\" merket fjernbart, men er det ikke"
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "kunne ikke nå media \"%s\""
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "maltraktert inndata: [%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "mottar rpm-filer fra medium \"%s\"..."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "Forbereder..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "bruker prosess %d for å utføre transaksjon"
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -774,82 +719,97 @@ msgstr ""
 "opprettet transaksjon for installasjon på %s (fjern=%d, installer=%d, "
 "oppgrader=%d)"
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr "kunne ikke opprette transaksjon"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "fjerner pakke %s"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "kan ikke fjerne pakke %s"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "legger til pakke %s (id=%d, eid=%d, oppdater=%d, fil=%s)"
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "kunne ikke installere pakke %s"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "pga. manglende %s"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "pga. utilfredsstilt %s"
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr "prøver å promotere %s"
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr "for å kunne beholde %s"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "for å kunne installere %s"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "pga. konflikter med %s"
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr "ikke etterspurt"
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Ugyldig signatur (%s)"
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "Ugyldig nøkkelid (%s)"
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Mangler signatur (%s)"
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "ugyldig proxydeklarasjon på kommandolinjen\n"
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: kan ikke lese rpm-fil \"%s\"\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Beklager, ugyldig valg, prøv igjen\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -865,42 +825,42 @@ msgstr ""
 "\n"
 "bruk:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - vis denne hjelpemeldingen.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - velg automatisk en pakke i valg.\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 "  --test         - kontroller at installasjonen kan bli riktig gjennomført.\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 "  --force        - tving påkallelse selv om noen pakker ikke eksisterer.\n"
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - distribuert urpmi over maskiner av alias.\n"
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - bruk en annen rot for rpm-installasjon.\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -909,73 +869,63 @@ msgstr ""
 "  --use-distrib  - konfigurer urpmi fortgående fra et distrib-tre, nyttig\n"
 "                   for å (av)installere en chroot med --root-opsjon.\n"
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - informativt modus.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - velg alle pakker som matcher uttrykket.\n"
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: ukjent valg \"-%s\", sjekk bruk med --help\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr "ukjente pakker"
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "ukjent pakke"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "fjerning av pakke %s vil ødelegge systemet ditt"
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr "Ingenting å fjerne"
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "Sjekker fjerning av følgende pakker"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
 "For å tilfredstille avhengigheter vil følgende pakker bli fjernet (%d MB)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (j/N) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "fjerner %s"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr "Fjerning mislykket"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Beklager, ugyldig valg, prøv igjen\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -991,39 +941,39 @@ msgstr ""
 "\n"
 "bruk:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - bruk bare oppdateringsmedia.\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - bruk bare gitte media, delt med komma.\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - ikke bruk gitte media, delt med komma.\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 "  --sortmedia    - sorter media etter understrenger separert med komma.\n"
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr "  --synthesis    - bruk den gitte syntesen i stedet for urpmi-db.\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - informativt modus.\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1034,119 +984,119 @@ msgstr ""
 "kommandolinjen,\n"
 "                   inkompatibelt med interaktivt modus).\n"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --uniq         - ikke vis identiske linjer.\n"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all          - vis alle etiketter.\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group        - vis etikett group: gruppe.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size         - vis etikett size: størrelse.\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --epoch        - vis etikett epoch: epoke.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary      - vis etikett summary: sammendrag.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description  - vis etikett description: beskrivelse.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr "  --sourcerpm    - vis etikett sourcerpm: kilderpm.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr "  --packager     - vis etikett packager: pakker.\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr "  --buildhost    - vis etikett buildhost: byggevert.\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --url          - vis etikett url: url.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr "  --provides     - vis etikett provides: alle tilbud (flere linjer).\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr "  --requires     - vis etikett requires: alle avhengigheter.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files        - vis etikett files: alle filer (flere linjer).\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr "  --conflicts    - vis etikett conflicts: alle konflikter.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr ""
 "  --obsoletes    - vis etikett obsoletes: alle erstatninger (flere linjer).\n"
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
 msgstr "  --env          - bruk spesifikt miljø (typisk en feilrapport).\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
 "  -i             - ignorer forskjell mellom små og store bokstaver i hver "
 "søkestreng.\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - vis versjon, utgivelse og arkitektur med navn.\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - inkluder perl-kodekatalog direkte som perl -e.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 "  -a             - binær OG operatør, sann hvis begge uttrykk er sanne.\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
@@ -1154,22 +1104,22 @@ msgstr ""
 "  -o             - binær ELLER operatør, sann hvis en av uttrykkene er "
 "sanne.\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - unær IKKE, sann hvis uttrykk er usann.\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr "  (              - venstre parantes for å åpne gruppeuttrykk.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr "  )              - høyre parantes for å lukke gruppeuttrykk.\n"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
@@ -1178,12 +1128,12 @@ msgstr ""
 "tilbakekall er :\n"
 "%s\n"
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "bruker spesifikt miljø på %s\n"
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1199,19 +1149,19 @@ msgstr ""
 "\n"
 "bruk:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - bruk den gitte syntese i stedet for urpmi db.\n"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 "  --auto-select  - velg automatisk pakker for oppgradering av systemet.\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
@@ -1220,7 +1170,7 @@ msgstr ""
 "  --no-uninstall - aldri spørr om å avinstallere en pakke, avbryt "
 "installasjonen.\n"
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1229,7 +1179,7 @@ msgstr ""
 "  --keep         - behold eksisterende pakker hvis mulig, avvis forespurte\n"
 "                   pakker som fører til fjerning.\n"
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1241,37 +1191,37 @@ msgstr ""
 "                   skal bli installert eller oppgradert,\n"
 "                   standard er %d.\n"
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - liten transaksjonslengde, standard er %d.\n"
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - pålegg uklart søk (samme som -y).\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - neste pakke er en kildepakke (samme som -s).\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - installer bare kildepakke (ingen binære).\n"
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - fjern rpm fra cache før noe annet.\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - behold rpm som ikke er brukt i cache.\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1280,7 +1230,7 @@ msgstr ""
 "  --allow-nodeps - tillat å spørre bruker om å installere pakker uten\n"
 "                   sjekking av avhengigheter.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1289,7 +1239,7 @@ msgstr ""
 "  --allow-force  - tillat å spørre bruker om å installere pakker uten\n"
 "                   sjekking av avhengighet og integritet.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1298,22 +1248,22 @@ msgstr ""
 "  --use-distrib  - konfigurer urpmi fortgående fra et distrib-tre, nyttig\n"
 "                   for å installere en chroot med --root-opsjon.\n"
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - bruk wget til å motta fjerne filer.\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - bruk curl til å motta fjerne filer.\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - sett grense på nedlastningshastigheten.\n"
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1322,7 +1272,7 @@ msgstr ""
 "  --resume       - gjenoppta overføring av delvis nedlastede filer\n"
 "                   (--no-resume deaktiverer det, deaktivert er standard).\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1331,7 +1281,7 @@ msgstr ""
 "  --proxy        - bruk spesifisert HTTP proxy, portnummeret antas\n"
 "                   å være 1080 som standard (format er <proxyhost[:port]>).\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1340,7 +1290,7 @@ msgstr ""
 "  --proxy-user   - spesifiser bruker og passord til bruk for proxy\n"
 "                   autentifisering (format er <bruker:passord>).\n"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1349,12 +1299,12 @@ msgstr ""
 "  --bug          - skriv ut en feilrapport i katalog indikert av\n"
 "                   neste argument.\n"
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - bruk X grensesnitt.\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1363,7 +1313,7 @@ msgstr ""
 "  --best-output  - velg beste grensesnitt i henhold til miljøet:\n"
 "                   X eller tekstmodus.\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1372,73 +1322,62 @@ msgstr ""
 "  --verify-rpm   - verifiser rpm-signatur før installasjon.\n"
 "                   (--no-verify-rpm deaktiverer det, standard er aktivert).\n"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - ekskluder sti separert med komma.\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - ekskluder dokumentfiler.\n"
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - velg alle treff på kommandolinjen.\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - tillat søk i tilbud for å finne pakke.\n"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - ikke søk i tilbud for å finne pakke.\n"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - pålegg uklart søk (samme som --fuzzy).\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s             - neste pakke er en kildepakke (samme som --src).\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - stillemodus.\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  navn eller rpm-filer gitt på kommandolinjen vil bli installert.\n"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr "Velg sted hvor fil skal lagres"
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "ugyldig proxydeklarasjon på kommandolinjen\n"
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: ukjent valg \"-%s\", sjekk bruk med --help\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr "Hva kan gjøres med binære rpm-filer når man bruker --install-src"
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1460,22 +1399,22 @@ msgstr ""
 "\n"
 "Hva ønsker du å gjøre?"
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "Gjør ingenting"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr "Ja, installer den"
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr "Lagre fil"
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1490,12 +1429,12 @@ msgstr ""
 "\n"
 "Det kan være at du bare foretrekker å lagre den. Hva er ditt valg?"
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, c-format
 msgid "Install it"
 msgstr "Installer den"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1504,42 +1443,42 @@ msgstr ""
 "Katalogen [%s] eksisterer allerede, vennligst bruk en annen katalog "
 "forfeilrapportering eller slett den"
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Kan ikke opprette katalog [%s] for feilrapport"
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Bare superbruker har adgang til å installere pakker"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "En av følgende pakker behøves for å installere %s:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "En av følgende pakker behøves:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Hva er ditt valg? (1-%d) "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "Pakkeinstallasjon..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "Initialiserer..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1548,12 +1487,12 @@ msgstr ""
 "Noen av pakkene som er ønsket kan ikke installeres:\n"
 "%s"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr "samtykker du ?"
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1564,7 +1503,7 @@ msgstr ""
 "må fjernes for at andre skal bli oppgradert:\n"
 "%s\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1573,15 +1512,15 @@ msgstr ""
 "Følgende pakker må fjernes for at andre skal bli oppgradert:\n"
 "%s"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
 "Følgende pakker vil bli installert for å tilfredstille avhengigheter (%d MB)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1590,37 +1529,47 @@ msgstr ""
 "Du må være root for å installere følgende avhengigheter:\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "kunne ikke få tak i kildepakker, avslutter"
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Vennligst sett inn mediumet kalt \"%s\" på enhet [%s]"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Trykk Enter når det er klart..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Laster ned pakke `%s'..."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% av %s ferdig, ETA = %s, hastighet = %s"
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% ferdig, hastighet = %s"
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Følgende pakker har ugyldige signaturer"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Ønsker du å fortsette installasjonen ?"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1631,57 +1580,57 @@ msgstr ""
 "%s\n"
 "Du ønsker antageligvis å oppdatere urpmidatabasen din"
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "Installasjon mislykket"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr "distribuerer %s"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr "installerer %s"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Installerer pakke `%s' (%s/%s)..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Prøve å installere uten å sjekke avhengigheter? (j/N) "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Prøve å installere enda hardere (--force)? (j/N) "
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d installasjonstransjaksjon mislykket"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "Installasjon er mulig"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "Alt er allerede installert"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr "restarter urpmi"
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1706,22 +1655,22 @@ msgstr ""
 "\n"
 "og [valg] er fra\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - opprett et oppdateringsmedium.\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr "  --probe-synthesis - prøv å finn og bruk syntese-filen.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr "  --probe-hdlist - prøv å finne og bruke hdlist-fil.\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
@@ -1730,7 +1679,7 @@ msgstr ""
 "  --no-probe     - ikke prøv å finn noe syntese- eller\n"
 "                   hdlist-fil.\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -1739,7 +1688,7 @@ msgstr ""
 "  --distrib      - oppretter automatisk alle media fra et installasjons-\n"
 "                   medium.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1750,7 +1699,7 @@ msgstr ""
 "                   distribusjon, XXX kan være main, contrib, updates\n"
 "                   eller alt annet som har blitt konfigurert ;-)\n"
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1759,7 +1708,7 @@ msgstr ""
 "  --from         - bruk spesifisert url for liste over speil, standard er\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1770,7 +1719,7 @@ msgstr ""
 "                   fra versjonen av distribusjonen gitt av den installerte\n"
 "                   mandrake-release pakken.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
@@ -1779,7 +1728,7 @@ msgstr ""
 "  --arch         - bruk spesifisert arkitektur, standard er arkitektur fra\n"
 "                   mandrake-release-pakke som er installert.\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
@@ -1788,73 +1737,52 @@ msgstr ""
 "  --virtual      - lag virtuelt media som alltid er oppdatert,\n"
 "                   bare file:// protokoll er tillatt.\n"
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - deaktiver MD5SUM-filsjekking.\n"
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - rengjør cache-katalog.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - tving generasjon av hdlist-filer.\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"ukjente valg '%s'\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "kan ikke legge til oppdateringer av en cooker distribusjon\n"
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "mottar speil fra %s ..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"ingen grunn til å gi <relativ sti til hdlist> med --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "ingen grunn til å gi <relativ sti til hdlist> med --distrib"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "kunne ikke oppdatere medium \"%s\"\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"<relativ sti til hdlist> mangler\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<relativ sti til hdlist> mangler\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"`with' mangler for nettverksmedia\n"
+msgid "`with' missing for network media\n"
+msgstr "`with' mangler for nettverksmedia\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "kunne ikke opprette medium \"%s\"\n"
@@ -1873,6 +1801,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - velg alle media.\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"ukjente valg '%s'\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1887,7 +1824,7 @@ msgstr ""
 "oppføringen til fjerning mangler\n"
 "(en av %s)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1896,27 +1833,27 @@ msgstr ""
 "bruk: urpmi.update [valg] <navn> ...\n"
 "hvor <navn> er et mediumnavn som skal oppdateres.\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - oppdater bare oppdateringsmedia.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr "  --force-key    - tving oppdatering av gpg-nøkkel.\n"
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - velg alle ikke-fjernbare media.\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "ingenting å oppdatere (bruk urpmi.addmedia for å legge til et media)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1925,7 +1862,7 @@ msgstr ""
 "oppføringen til oppdatering mangler\n"
 "(en av %s)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1941,22 +1878,22 @@ msgstr ""
 "\n"
 "bruk:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - lister opp tilgjengelige pakker.\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - lister tilgjengelige medier.\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - lister tilgjengelige medier og deres url.\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
@@ -1964,17 +1901,17 @@ msgstr ""
 "  --dump-config  - dump konfigurasjonen i form av et urpmi.addmedia-"
 "argument.\n"
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr "  --list-nodes   - lister tilgjengelige når --parallel brukes.\n"
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - list tilgjengelige parallel-aliaser.\n"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
@@ -1983,13 +1920,13 @@ msgstr ""
 "  --headers      - trekk ut hoder for pakke listet fra urpmi-db til\n"
 "                   stdout (kun root).\n"
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr "  --sources      - gir alle kildepakker før nedlasting (kun root).\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
@@ -1998,17 +1935,17 @@ msgstr ""
 "  --use-distrib  - konfigurer urpmi fortgående fra et distrib-tre.\n"
 "                   Dette tillater å forespøre en distro.\n"
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - vis changelog.\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - utvid forespørsel til pakkeavhengigheter.\n"
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -2017,58 +1954,112 @@ msgstr ""
 "  -u             - fjerner pakke hvis en nyere versjon allerede er er "
 "installert.\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 "  -c             - fullstendig utskrift med pakke som skal bli fjernet.\n"
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - reversert søk til hva som krever pakke.\n"
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 "  -i             - vis verdigfull informasjon i menneskelig lesbart format.\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - vis grupper også med navn.\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - vis versjon og utgivelse også med navn.\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - list opp filer i pakke.\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  navn eller rpm-filer gitt på kommandolinjem er etterspurt.\n"
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: ukjent valg \"-%s\", sjekk bruk med --help\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: kan ikke lese rpm-fil \"%s\"\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes kan bare brukes med --parallel"
 
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "Ukjent webfetch `%s' !!!\n"
+
+#~ msgid "copy failed: %s"
+#~ msgstr "kopiering mislykket: %s"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "wget mangler\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "wget feilet: avsluttet med %d eller signal %d\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "curl mangler\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "curl mislykket: avsluttet med %d eller signal %d\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "rsync er borte\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "rsync mislykket: avsluttet med %d eller signal %d\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "ssh mangler\n"
+
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpme: ukjent valg \"-%s\", sjekk bruk med --help\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmi: ukjent valg \"-%s\", sjekk bruk med --help\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr ""
+#~ "Følgende pakker vil bli installert for å tilfredstille avhengigheter (%d "
+#~ "MB)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "ingen grunn til å gi <relativ sti til hdlist> med --distrib"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "<relativ sti til hdlist> mangler\n"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "`with' mangler for nettverksmedia\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmq: ukjent valg \"-%s\", sjekk bruk med --help\n"
+
 #~ msgid "copy of [%s] failed (file is suspectingly small)"
 #~ msgstr "kopiering av [%s] mislykket (fil er mistenkelig liten)"
 
diff --git a/po/nl.po b/po/nl.po
index 4f43adbe..2a17b9e7 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-nl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2004-03-25 14:49-0500\n"
 "Last-Translator: Reinout van Schouwen <reinout@cs.vu.nl>\n"
 "Language-Team: Nederlands\n"
@@ -56,22 +56,22 @@ msgstr ""
 "Automatische installatie van pakketten...\n"
 "U vroeg de installatie van pakket %s aan\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "Is dit goed?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (J/n) "
@@ -81,7 +81,7 @@ msgstr " (J/n) "
 msgid "%s: command not found\n"
 msgstr "%s: opdracht niet gevonden\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
@@ -90,116 +90,55 @@ msgstr ""
 "gebruik: %s [opties]\n"
 "waarbij [opties] komen uit de volgende\n"
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - geeft deze hulptekst.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "  -g [groep]      - bepertkt resultaten tot gegeven groep.\n"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, c-format
 msgid "                    defaults is %s.\n"
 msgstr "                    standaard is %s.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Onbekende webfetch `%s' !!!\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "onbekend protocol gedefinieerd voor %s"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "geen ``webfetch'' gevonden, ondersteund zijn: %s\n"
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "kon protocol niet verwerken: %s"
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "kopiëren mislukt: %s"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "wget is niet geïnstalleerd\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget is mislukt: afgesloten met %d of signaal %d\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "curl is niet geïnstalleerd\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl is mislukt: afgesloten met %d of signaal %d\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "rsync ontbreekt\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "rsync is mislukt: beeindigd met %d of signaal %d\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "wget is niet geïnstalleerd\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% van %s voltooid, ETA = %s, snelheid = %s"
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% voltooid, snelheid = %s"
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...ontvangen mislukt: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "syntaxfout in configuratiebestand op regel %s"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 "medium \"%s\" probeert een hdlist te gebruiken die al wordt gebruikt, medium "
 "genegeerd"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 "medium \"%s\" probeert een al gebruikte lijst te gebruiken, medium genegeerd"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -208,41 +147,41 @@ msgstr ""
 "kon medium \"%s\" niet verzorgen, omdat het list bestand al in gebruik is "
 "door een ander medium"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 "kan naam \"%s\" niet gebruiken voor naamloos medium omdat deze al in gebruik "
 "is"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 "kon geen rekening houden met het medium \"%s\", omdat lijstbestand [%s] niet "
 "bestaat"
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "kon medium van dit hdlist bestand niet vaststellen [%s]"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "kon hdlist bestand \"%s\" niet benaderen, medium genegeerd"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "kon list bestand van \"%s\" niet benaderen, medium genegeerd"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "bezig met proberen bestaand medium \"%s\" te omzeilen"
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -251,92 +190,92 @@ msgstr ""
 "Virtueel medium \"%s\" zou geen gedefinieerde hdlist moeten hebben, medium "
 "genegeerd"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "Virtueel medium \"%s\" moet een leeg url hebben, medium genegeerd"
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "kon hdlist bestand voor \"%s\" niet vinden, medium genegeerd"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "kan het lijstbestand voor \"%s\" niet vinden, medium genegeerd"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "onsamenhangend lijst-bestand voor \"%s\", medium genegeerd"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "kon list bestaand voor \"%s\" niet inspecteren, medium genegeerd"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "teveel koppelpunten voor verwisselbaar medium \"%s\""
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "gebruikt verwisselbare schijf als \"%s\""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "gebruikt andere verwisselbare schijf [%s] voor \"%s\""
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "kon de padnaam van verwisselbaar medium \"%s\" niet vinden"
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "kon configuratiebestand [%s] niet wegschrijven"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "config-bestand [%s] wegschrijven"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "Kan parallelle modus niet tegelijk met use-distrib modus gebruiken"
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "niet in staat \"%s\" te interpreteren in bestand [%s]"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "bezig met onderzoeken parallelle handler in bestand [%s]"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "parallelle handler gevonden voor knooppunten: %s"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "geassocieerde media worden voor parallelle modus gebruikt: %s"
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "niet in staat parallelle optie \"%s\" te gebruiken"
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -345,90 +284,90 @@ msgstr ""
 "--synthesis kan niet gebruikt worden met --media, --excludemedia, --"
 "sortmedia, --update of --parallel"
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "bezig met onderzoeken van het synthesis bestand [%s]"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "bezig met onderzoeken hdlist bestand [%s]"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "Virtueel medium \"%s\" is geen lokaal medium, genegeerd"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "probleem met lezen van hdlist of synthesis bestand van medium \"%s\""
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "uitvoeren tweede fase, controleren van afhankelijkheden\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "pakket %s overslaan"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "Zou pakket %s installeren, niet opwaarderen"
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "kon rpmdb niet openen"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "medium \"%s\" bestaat al"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr "Virtueel medium moet lokaal zijn"
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "toegevoegd medium %s"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "kon het eerste installatiemedium niet vinden"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "bezig met kopiëren hdlist bestanden"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "...kopiëren mislukt"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "...kopiëren is klaar"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
@@ -437,43 +376,49 @@ msgstr ""
 "kon het eerste installatiemedium niet vinden (geen Mandrake/base/hdlists "
 "bestanden gevonden)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "bezig met ontvangen van hdlists bestand..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "...ontvangen is klaar"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...ontvangen mislukt: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "ongeldige hdlist omschrijving \"%s\" in hdlists bestand"
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "probeert een onbestaand medium \"%s\" te selecteren"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "selecteren van meerdere media: %s"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "bezig met verwijderen van medium \"%s\""
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -484,7 +429,7 @@ msgstr ""
 "dit kan gebeuren wanneer u de map handmatig heeft gekoppeld bij het aanmaken "
 "van het medium."
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -493,222 +438,222 @@ msgstr ""
 "Virtueel medium \"%s\" moet een geldige bron hdlist of synthesis hebben, "
 "medium genegeerd"
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "bezig met kopiëren omschrijving bestand van \"%s\"..."
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "berekenen md5sum van bestaande bron hdlist (of synthesis)"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "bezig met onderzoeken MD5SUM bestand"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "bezig met kopiëren bron hdlist (of synthesis) van \"%s\"..."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "kopiëren van [%s] mislukt (bestand is verdacht klein)"
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "berekenen md5sum van gekopieerde bron hdlist (of synthesis)"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "kopiëren van [%s] mislukt (md5sum onjuist)"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "probleem met lezen van synthesis bestand van medium \"%s\""
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "bezig met lezen van rpm-bestanden van [%s]"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "kon rpm-bestanden niet lezen van [%s]: %s"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "geen rpm bestanden gevonden van [%s]"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "bezig met bron hdlist (of synthesis) van \"%s\" te ontvangen..."
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "afgezochte hdlist (of synthesis) gevonden als %s"
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "berekenen md5sum van ontvangen bron hdlist (of synthesis)"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr "md5sum verschillend"
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "ontvangen van bron hdlist (of synthesis) is mislukt"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "geen hdlist-bestand gevonden voor medium \"%s\""
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "bestand [%s] reeds gebruik in hetzelfde medium \"%s\""
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "kan het hdlist-bestand van \"%s\" niet analyseren"
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "kon lijstbestand van \"%s\" niet schrijven"
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "bezig met schrijven van lijstbestand voor medium \"%s\""
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "er is niets geschreven in het lijstbestand voor \"%s\""
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "onderzoeken van publieke sleutelbestand van \"%s\"..."
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...sleutel %s uit publiek sleutelbestand van \"%s\" geïmporteerd"
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "kon publieke sleutelbestand van \"%s\" niet importeren"
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "bezig met lezen van headers van medium \"%s\""
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "bezig met bouwen hdlist [%s]"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "hdlist synthesis bestand opgebouwd voor medium \"%s\""
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "%d headers in de buffer gevonden"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "bezig met het verwijderen van %d verouderde titels in de cache"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "%s koppelen..."
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "%s afkoppelen..."
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "%s van plaats veranderde ingangen in lijst van afhankelijkheden"
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "geen ingangen van plaats veranderd in depslist"
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "ongeldige rpm-bestandsnaam [%s]"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "bezig met ontvangen van rpm bestand [%s] ..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "kon rpm-bestand [%s] niet benaderen"
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "kon rpm-bestand niet registreren"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "registreren van lokale pakketten is mislukt"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "geen pakket genaamd %s"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "De volgende pakketten bevatten %s: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "er zijn meerdere pakketten met dezelfde rpm bestandsnaam \"%s\""
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "kon [%s] niet correct verwerken op waarde \"%s\""
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -717,63 +662,63 @@ msgstr ""
 "medium \"%s\" gebruikt een ongeldig lijstbestand:\n"
 "  mirror is wellicht niet up-to-date, probeert nu een alternatieve methode"
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "medium \"%s\" bevat geen locatie voor rpm bestanden"
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "pakket %s is niet gevonden."
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi database geblokkeerd"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "medium \"%s\" is niet geselecteerd"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "kon rpm bestand [%s] niet lezen van medium \"%s\""
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 "onsamenhangend medium \"%s\" als verwisselbaar gemarkeerd, maar is dit niet"
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "kon medium \"%s\" niet benaderen"
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "ongeldige invoer [%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "bezig met ontvangen van rpm bestanden van medium \"%s\"..."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "Bezig met voorbereiden..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "proces %d gebruikt voor uitvoeren van transactie"
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -781,82 +726,97 @@ msgstr ""
 "transactie aangemaakt om te installeren op %s (verwijderen=%d, installeren=%"
 "d, vernieuwen=%d)"
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr "Niet in staat om transactie aan te maken."
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "bezig met verwijderen van pakket %s"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "kon pakket %s niet verwijderen"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "toevoegen van pakket %s (id=%d, eid=%d, update=%d, bestand=%s)"
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "kon volgend pakket niet installeren: %s"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "vanwege missende %s"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "vanwege onvoldane %s"
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr "probeer %s op te waarderen"
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr "Om %s te behouden"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "in volgorde om %s te installeren"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "vanwege conflicten met %s"
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr "ongevraagd"
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Ongeldige ondertekening (%s)"
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "Ongeldig sleutel-ID (%s)"
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Geen ondertekening aanwezig (%s)"
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "ongeldige proxy-aanduiding op opdrachtregel\n"
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: kon rpm bestand \"%s\" niet lezen\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Sorry, foutieve keuze, probeer een andere\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -873,18 +833,18 @@ msgstr ""
 "\n"
 "gebruik:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - geeft deze hulptekst.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - selecteer automatisch een pakket uit de keuzes.\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
@@ -892,7 +852,7 @@ msgstr ""
 "  --test         - verifiëren dat de installatie correct uitgevoerd kan "
 "worden.\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
@@ -900,18 +860,18 @@ msgstr ""
 "  --force        - aanroep forceren zelfs als sommige pakketten niet "
 "bestaan.\n"
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - gedistribueerde urpmi over computers van alias.\n"
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr ""
 "  --root         - gebruik andere hoofdmap (root) voor rpm-installatie.\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -920,76 +880,66 @@ msgstr ""
 "  --use-distrib  - urpmi dynamisch configureren vanuit distrib-boom, handig\n"
 "                   om een chroot te (de)installeren met de --root optie.\n"
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - 'extra informatie'-modus.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 "  -a             - selecteer alle pakketten die overeenkomen met de "
 "expressie.\n"
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: onbekende optie \"-%s\", bekijk voor gebruik --help\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr "onbekende pakketten"
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "onbekend pakket"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "het verwijderen van %s zal uw systeem verstoren"
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr "Niets te verwijderen"
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "Aanvinken om de volgende pakketten te verwijderen"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
 "Om aan de afhankelijkheden te voldoen, worden de volgende pakketten "
 "verwijderd (%d MB)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (j/N) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "bezig met verwijderen van %s"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr "Verwijderen is mislukt"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Sorry, foutieve keuze, probeer een andere\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1006,23 +956,22 @@ msgstr ""
 "\n"
 "gebruik:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - gebruik alleen bijwerkmedia.\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - alleen de aangegeven media, kommagescheiden.\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-"  --excludemedia - gebruik de gegeven media niet, kommagescheiden.\n"
+msgstr "  --excludemedia - gebruik de gegeven media niet, kommagescheiden.\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1030,18 +979,18 @@ msgstr ""
 "  --sortmedia    - media sorteren afgaand van substrings gescheiden door "
 "komma's.\n"
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - opgegeven synthesis gebruiken in plaats van urpmi db.\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - 'uitgebreid verslag'-modus.\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1052,87 +1001,87 @@ msgstr ""
 "wordt meegegeven\n"
 "                   lijn, niet compatible met interactieve mode).\n"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --uniq         - geeft geen identieke regels weer.\n"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all           - geeft alle tags weer.\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group         - geeft de tag group weer: groep.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size          - geeft de tag size weer: grootte.\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --epoch        - geeft de tag epoch weer: epoch.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary       - geeft de tag summary: samenvatting.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description   - geeft de tag description: omschrijving.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr "  --sourcerpm    - geeft de tag sourcerpm: broncode rpm.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr "  --packager     - geeft de tag packager: pakketsamensteller.\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr "  --buildhost    - geeft de tag buildhost: 'bouwcomputer'.\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --url          - geeft de tag url: url.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr "  --provides      - geeft de tag provides: alle 'levert's.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr "  --requires      - geeft de tag requires: alle vereisten\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files         - geeft de tag files: alle bestanden.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr "  --conflicts     - geeft de tag conflicts: alle conflicten.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr "  --obsoletes     - geeft de tag obsoletes: alle verouderden\n"
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
@@ -1141,24 +1090,24 @@ msgstr ""
 "  --env          - specifieke omgeving gebruiken (meestal\n"
 "                   een foutrapport).\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
 "  -i             - onderscheid hoofd-/kleine letters in elk patroon "
 "negeren.\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - geeft de versie, uitgave en arch met naam.\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - voeg perl code direct als perl -e toe.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
@@ -1166,29 +1115,29 @@ msgstr ""
 "  -a             - binaire AND operator, waar als beide expressies waar "
 "zijn.\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 "  -o             - binaire OR operator, waar als een expressie waar is.\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - unary NOT, waar als expressie onwaar is.\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr "  (              - linker haakje om groepexpressie te openen.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr "  )              - rechter haakje om groepexpressie te sluiten.\n"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
@@ -1197,12 +1146,12 @@ msgstr ""
 "Terugbellen is :\n"
 "%s\n"
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "maakt gebruik van aangegeven omgeving op %s\n"
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1219,13 +1168,13 @@ msgstr ""
 "\n"
 "gebruik:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - opgegeven synthesis gebruiken in plaats van urpmi db.\n"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
@@ -1233,7 +1182,7 @@ msgstr ""
 "  --auto-select  - automatisch pakketten selecteren voor "
 "systeemopwaardering.\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
@@ -1242,7 +1191,7 @@ msgstr ""
 "  --no-uninstall - vraag nooit om de-installatie van een pakket, stop de "
 "installatie.\n"
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1252,7 +1201,7 @@ msgstr ""
 "negeer gevraagde\n"
 "                   pakketten die tot verwijderen nopen.\n"
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1263,40 +1212,40 @@ msgstr ""
 "                   aangegeven aantal pakketten worden geïnstalleerd of\n"
 "                   opgewaardeerd, standaard is %d.\n"
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr " --split-length - korte transactielengte, standaard is %d.\n"
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr " --fuzzy        - onprecies zoeken gebruiken (zelfde als -y).\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 "  --src          - volgende pakket is een bronpakket (zelfde als -s).\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 "  --install-src  - installeer alleen bronpakketten (geen uitvoerbare "
 "bestanden)\n"
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean      - rpm uit cache verwijderen vóór al het andere\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - houd niet gebruikte rpms in cache.\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1305,7 +1254,7 @@ msgstr ""
 "  --allow-nodeps - sta toe de gebruiker te vragen om pakketten te\n"
 "                    installeren zonder afhankelijkhedencontrole.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1315,7 +1264,7 @@ msgstr ""
 "                     installeren zonder afhankelijkheids controle en zonder\n"
 "                     integriteits controle.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1324,24 +1273,24 @@ msgstr ""
 "  --use-distrib  - urpmi dynamisch configureren vanuit een distrib-boom,\n"
 "                   handig om een chroot te instaleren met de --root optie.\n"
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 "  --wget         - wget gebruiken om bestanden op afstand te ontvangen.\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 "  --curl         - gebruik curl om bestanden op afstand te ontvangen.\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - de download snelheid begrenzen.\n"
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1350,7 +1299,7 @@ msgstr ""
 "  --resume       -laden hervatten van gedeeltelijk geladen bestand \n"
 "                   (--no-resume schakelt dit uit, standaard uitgeschakeld).\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1360,7 +1309,7 @@ msgstr ""
 "nummer\n"
 "                    is 1080 (formaat is <proxyhost[:poort]>).\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1369,7 +1318,7 @@ msgstr ""
 "  --proxy-user   - specificeer gebruikersnaam en wachtwoord voor proxy-\n"
 "                    aanmelding (formaat is <gebruiker:wachtwoord>).\n"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1378,12 +1327,12 @@ msgstr ""
 "  --bug          - schrijf een foutrapport naar de map aangegeven\n"
 "                   door het volgende argument.\n"
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - gebruik een grafische interface.\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1392,7 +1341,7 @@ msgstr ""
 "  --best-output  - gebruik de beste interface afhankelijk van de omgeving:\n"
 "                   grafische of tekst modus.\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1402,77 +1351,66 @@ msgstr ""
 "                   (--no-verify-rpm schakelt dit uit, standaard "
 "ingeschakeld).\n"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - pad (gescheiden door komma) uitsluiten.\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - doc bestanden niet meerekenen.\n"
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - selecteer alle resultaten van console.\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 "  -p             - staat zoeken toe in 'levert' om een pakket te vinden.\n"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 "  -P             - niet in 'provides' zoeken om een pakket te vinden.\n"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - onprecies zoeken gebruiken (zelfde als --fuzzy).\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 "  -s             - volgend pakket is een bronpakket (zelfde als --src).\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - stille modus.\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 "  namen of rpm bestanden gegeven via opdrachtregel worden geïnstalleerd.\n"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr "Kies map om bestand in op te slaan"
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "ongeldige proxy-aanduiding op opdrachtregel\n"
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: onbekende optie \"-%s\", bekijk voor gebruik --help\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr "Wat er gebeurt met uitvoerbare rpm bestanden bij --install-src"
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1493,22 +1431,22 @@ msgstr ""
 "\n"
 "Wat wilt u doen?"
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "Niets doen"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr "Doorgaan met installatie"
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr "Bestand opslaan"
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1517,19 +1455,20 @@ msgid ""
 "\n"
 "You may prefer to just save it. What is your choice?"
 msgstr ""
-"U staat op het punt het volgende softwarepakket op uw computer te installeren:\n"
+"U staat op het punt het volgende softwarepakket op uw computer te "
+"installeren:\n"
 "\n"
 "%s\n"
 "\n"
 "Mogelijk geeft u er de voorkeur aan het bestand slechts op te slaan. Wat is "
 "uw keuze?"
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, c-format
 msgid "Install it"
 msgstr "Pakket installeren"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1538,42 +1477,42 @@ msgstr ""
 "De map [%s] bestaat reeds, gebruik een andere map voor het foutrapport of "
 "verwijder hem"
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Kon directory [%s] niet aanmaken voor programmafoutrapport"
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Alleen de beheerder mag pakketten installeren"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "Eén van de volgende pakketten is benodigd om te installeren: %s:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Eén van de volgende pakketten is benodigd:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Wat is uw keuze? (1-%d)"
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "Pakket-installatie..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "Initialiseren..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1582,12 +1521,12 @@ msgstr ""
 "Bepaalde gevraagde pakketten konden niet worden geïnstalleerd:\n"
 "%s"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr "Bent u het daarmee eens?"
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1598,7 +1537,7 @@ msgstr ""
 "opwaarderen:\n"
 "%s\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1608,16 +1547,16 @@ msgstr ""
 "opwaarderen:\n"
 "%s"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
 "Om aan de afhankelijkheden te voldoen worden de volgende pakketten ook "
 "geïnstalleerd (%d MB)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1626,37 +1565,47 @@ msgstr ""
 "U dient root te zijn om de volgende afhankelijkheden te installeren:\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "kan bronpakketten niet ontvangen, bezig met afbreken"
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Gelieve het medium genaamd \"%s\" in apparaat [%s] te plaatsen"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Druk op Enter wanneer u klaar bent..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Bezig met downloaden van pakket `%s'..."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% van %s voltooid, ETA = %s, snelheid = %s"
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% voltooid, snelheid = %s"
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "De volgende pakketten bevatten een onjuiste handtekening"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Wilt u doorgaan met de installatie ?"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1667,58 +1616,58 @@ msgstr ""
 "%s\n"
 "Misschien moet u de urpmi database opwaarderen"
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "Installatie mislukt"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr "bezig met distribueren van %s"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr "bezig met installeren van %s"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Bezig met installeren van pakket `%s' (%s/%s)..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr ""
 "Proberen te installeren zonder de afhankelijkheden te controleren? (j/N) "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Installatie trachten te forceren (--force)? (j/N) "
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d installatie-transacties mislukt"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "Installatie is mogelijk"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "Alles is al geïnstalleerd"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr "urpmi herstarten"
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1743,25 +1692,25 @@ msgstr ""
 "\n"
 "en [opties] kunnen zijn:\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - maak een bijwerkmedium aan.\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
 "  --probe-synthesis - een synthesis bestand proberen te vinden en\n"
 "                      te gebruiken.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr ""
 "  --probe-hdlist - probeer een hdlist bestand te vinden en te gebruiken.\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
@@ -1770,7 +1719,7 @@ msgstr ""
 "  --no-probe     -  probeer geen synthesis of hdlist bestand te\n"
 "                   vinden.\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -1779,7 +1728,7 @@ msgstr ""
 "  --distrib      - maakt automatisch alle media van een installatiemedium\n"
 "                    aan.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1792,7 +1741,7 @@ msgstr ""
 "anders dat\n"
 "                   geconfigureerd is) zijn.\n"
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1802,7 +1751,7 @@ msgstr ""
 "standaard\n"
 "                   is %s\n"
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1813,7 +1762,7 @@ msgstr ""
 "                   wordt gehaald uit het geïnstalleerde mandrake-release\n"
 "                   pakket.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
@@ -1822,7 +1771,7 @@ msgstr ""
 "  --arch         - gebruik aangegeven architectuur, standaard is de versie\n"
 "                   van het geïnstalleerde mandrake-release pakket.\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
@@ -1831,73 +1780,52 @@ msgstr ""
 "  --virtual      - maakt virtueel medium aan dat altijd bijgewerkt is,\n"
 "                   alleen file:// protocol is toegestaan.\n"
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  -geen-md5som  - MD5SUM bestandscontrole uitschakelen.\n"
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - buffermap headers wissen.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - aanmaak van hdlist bestanden forceren.\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"onbekende opties '%s'\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "kan geen updates van een cooker distributie toevoegen\n"
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "ontvangen van mirrors op %s..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"niet nodig om <relatief pad van hdlist> te geven met --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "niet nodig om <relatief pad van hdlist> te geven met --distrib"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "kon medium \"%s\" niet bijwerken\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"<bijbehorend pad van hdlist> ontbreekt\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<bijbehorend pad van hdlist> ontbreekt\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"`with' ontbreekt voor netwerkmedia\n"
+msgid "`with' missing for network media\n"
+msgstr "`with' ontbreekt voor netwerkmedia\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "kon medium \"%s\" niet maken\n"
@@ -1916,6 +1844,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - alle media selecteren.\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"onbekende opties '%s'\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1930,7 +1867,7 @@ msgstr ""
 "het te verwijderen item ontbreekt\n"
 "(één van %s)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1939,28 +1876,28 @@ msgstr ""
 "gebruik: urpmi.update [opties] <naam> ...\n"
 "waar <naam> een mediumnaam is die bijgewerkt moet worden.\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - vernieuw alleen bijwerkmedia.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr "  --forceer-key  - forceer bijwerken van de gpg sleutel.\n"
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - selecteer alle niet-verwisselbare media.\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "niets om te verversen (gebruik urpmi.addmedia om media toe te voegen)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1969,7 +1906,7 @@ msgstr ""
 "de invoer om op te waarderen ontbreekt\n"
 "(één van %s)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1986,22 +1923,22 @@ msgstr ""
 "\n"
 "gebruik:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list          - geeft alle beschikbare pakketten weer\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - beschikbare media opsommen.\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url   - beschikbare media en hun url opsommen.\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
@@ -2009,17 +1946,17 @@ msgstr ""
 "  --dump-config  - dump de configuratie in de vorm van een urpmi.addmedia "
 "formaat.\n"
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr "  --list-nodes   - beschikbare knooppunten opsommen bij --parallel.\n"
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - beschikbare parallelle aliasen opsommen.\n"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
@@ -2029,7 +1966,7 @@ msgstr ""
 "                  database, en stuur ze naar de standaarduitvoer (alleen "
 "root)\n"
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
@@ -2037,7 +1974,7 @@ msgstr ""
 "  --sources      - geef alle bronpakketten voor het downloaden (alleen root "
 "mag dit).\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
@@ -2046,19 +1983,19 @@ msgstr ""
 "  --use-distrib  - urpmi dynamisch configureren vanuit distrib-boom.\n"
 "                   Hiermee kunt u de distro bevragen.\n"
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - geeft veranderingen-logboek weer.\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 "  -d             - de zoekopdracht uitbreiden om aan afhankelijkheden van\n"
 "                    pakketten te voldoen.\n"
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -2067,54 +2004,108 @@ msgstr ""
 "  -u             - verwijder pakket als een recentere versie al is "
 "geïnstalleerd.\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - complete uitvoer met te verwijderen pakket.\n"
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - omgekeerde zoekactie voor wat het pakket vereist.\n"
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -i             - nuttige informatie afdrukken in leesbare vorm.\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - toont de groepen ook met namen.\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - geeft de versie en release samen met de naam.\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - geeft alle bestanden in pakket weer\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 "  namen van rpm bestanden opgegeven via console zijn in de wachtrij "
 "geplaatst\n"
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: onbekende optie \"-%s\", controleer gebruik met --help\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: kon rpm bestand \"%s\" niet lezen\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes kan alleen worden gebruikt met --parallel"
+
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "Onbekende webfetch `%s' !!!\n"
+
+#~ msgid "copy failed: %s"
+#~ msgstr "kopiëren mislukt: %s"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "wget is niet geïnstalleerd\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "wget is mislukt: afgesloten met %d of signaal %d\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "curl is niet geïnstalleerd\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "curl is mislukt: afgesloten met %d of signaal %d\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "rsync ontbreekt\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "rsync is mislukt: beeindigd met %d of signaal %d\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "wget is niet geïnstalleerd\n"
+
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpme: onbekende optie \"-%s\", bekijk voor gebruik --help\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmi: onbekende optie \"-%s\", bekijk voor gebruik --help\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr ""
+#~ "Om aan de afhankelijkheden te voldoen worden de volgende pakketten ook "
+#~ "geïnstalleerd (%d MB)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "niet nodig om <relatief pad van hdlist> te geven met --distrib"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "<bijbehorend pad van hdlist> ontbreekt\n"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "`with' ontbreekt voor netwerkmedia\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmq: onbekende optie \"-%s\", controleer gebruik met --help\n"
diff --git a/po/nn.po b/po/nn.po
index 3402e81a..cc08a57b 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
-"PO-Revision-Date: 2004-03-07 12:37+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
+"PO-Revision-Date: 2004-04-23 22:32+0200\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
@@ -49,22 +49,22 @@ msgstr ""
 "Automatisk pakkeinstallering ...\n"
 "Du har bedt om installering av pakken %s.\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "Er dette greitt?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (J/N) "
@@ -74,7 +74,7 @@ msgstr " (J/N) "
 msgid "%s: command not found\n"
 msgstr "%s: Fann ikkje kommandoen.\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
@@ -83,116 +83,55 @@ msgstr ""
 "Bruk: %s [val]\n"
 "der [val] er av:\n"
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      – Vis denne hjelpeteksten.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "  --g[roup]      – Vis merkelappen «group»: gruppe.\n"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, c-format
 msgid "                    defaults is %s.\n"
 msgstr "                    Standardverdi: %s.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Ukjent «webfetch» «%s».\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "Ukjend protokoll definert for «%s»."
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "Fann ingen «webfetch». Støtta «webfetch»-ar er: %s\n"
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "Kan ikkje bruka protokollen: %s."
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "Feil ved kopiering: %s."
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "«wget» manglar.\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "Mislukka «wget»: Avslutta med %d eller signalet %d.\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "«curl» manglar.\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "Mislukka «curl»: avslutta med %d eller signalet %d.\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "«rsync» manglar.\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "Mislukka «rsync»: avslutta med %d eller signalet %d.\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "«ssh» manglar.\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% av %s motteken. Tid igjen: %s. Fart: %s."
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% motteken. Fart: %s."
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "... ikkje motteken: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "Syntaksfeil i oppsettfila på linje %s."
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 "Mediet «%s» prøver å bruka ei allereie brukt «hdlist»-fil. Hoppar over "
 "mediet."
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 "Mediet «%s» prøver å bruka ei allereie brukt «list»-fil. Hoppar over mediet."
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -201,37 +140,37 @@ msgstr ""
 "Kan ikkje bruka mediet «%s», då «list»-fila allereie er brukt av eit anna "
 "medium."
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr "Namnet «%s» er allereie opptatt."
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr "Kan ikkje bruka mediet «%s», då det ikkje finst noko «list»-fil [%s]."
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "Klarte ikkje finna mediet til denne «hdlist»-fila [%s]."
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "Klarte ikkje opna «hdlist»-fila til «%s». Hoppar over mediet."
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "Klarte ikkje opna «list»-fila til «%s». Hoppar over mediet."
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "Prøver å hoppa over eksisterande medium «%s». Unngår"
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -240,93 +179,93 @@ msgstr ""
 "Det virtuellet mediet «%s» kan ikkje ha definert noko «hdlist»- eller «list»-"
 "fil. Hoppar over mediet."
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr ""
 "Det virtuelle mediet «%s» må ha ei eintydig adresse. Hoppar over medium."
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "Fann ikkje noko «hdlist»-fil for «%s». Hoppar over mediet."
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "Fann ikkje noko «list»-fil for «%s». Hoppar over mediet."
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "Øydelagt «list»-fil for «%s». Hoppar over mediet."
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "Klarte ikkje lesa «list»-fil for «%s». Hoppar over mediet."
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "For mange monteringspunkt for det flyttbare mediet «%s»."
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "Brukar flyttbar eining som «%s»."
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "Brukar forskjellig flyttbar eining [%s] for «%s»."
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "Fann ikkje adresse til det flyttbare mediet «%s»."
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "Klarte ikkje skriva oppsettfila [%s]."
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "Skriv oppsettfil [%s]."
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "Kan ikkje bruka parallellmodus i «use-distrib»-modus."
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "Klarte ikkje tolka «%s» i fila [%s]."
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "Undersøkjer parallellhandtering i fila [%s]."
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "Fann parallellhandtering for nodar: %s."
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "Brukar tilknytta medium for parallellmodus: %s."
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "Klarte ikkje bruka parallellvalet «%s»."
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -335,90 +274,90 @@ msgstr ""
 "Kan ikkje bruka «--synthesis» saman med «--media», «--excludemedia», «--"
 "sortmedia», «--update» eller «--parallel»."
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "Les syntesefila [%s]."
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "Les «hdlist»-fila [%s]."
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "Det virtuelle mediet «%s» er ikkje lokalt. Hoppar over mediet."
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "Feil ved lesing av «hdlist» eller syntesefila til mediet «%s»."
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "Går gjennom på nytt for å rekna ut avhengnader.\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "Hoppar over pakken «%s»."
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "Ville installert i staden for å oppgradera pakken «%s»."
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "Klarte ikkje opna «rpmdb»."
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "Mediet «%s» finst allereie."
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr "Det virtuelle mediet må vera lokalt."
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "La til mediet «%s»."
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "Klarte ikkje lesa frå første installasjonsmedium."
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "Kopierer «hdlist»-fil ..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "... mislukka kopiering."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "... kopiering fullført."
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
@@ -427,43 +366,49 @@ msgstr ""
 "Klarte ikkje lesa frå første installasjonsmedium (fann inga Mandrake/base/"
 "hdlists-fil)."
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "Mottek «hdlists»-fil ..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "... ferdig motteken."
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "... ikkje motteken: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "Ugyldig «hdlist»-beskriving («%s») i «hdlists»-fila."
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "Prøver å velja ikkjeeksisterande medium «%s»."
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "Vel fleire medium: %s."
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "«%s»."
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "Fjernar mediet «%s»."
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -473,7 +418,7 @@ msgstr ""
 "Fekk ikkje tilgang til mediet «%s».\n"
 "Dette kan vera fordi du manuelt monterte mappa når du oppretta mediet."
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -482,222 +427,222 @@ msgstr ""
 "Det virtuelle mediet «%s» må ha ei gyldig kjelde-«hdlist» eller -syntese. "
 "Hoppar over mediet."
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "Kopierer beskrivingsfila til «%s» ..."
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "Reknar ut md5sum av gammal kjelde-«hdlist» (eller syntese)."
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "Kontrollerer md5sum."
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "Kopierer kjelde-«hdlist» (eller syntese) til «%s» ..."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "Mislykka kopiering av [%s] (fila er mistenkeleg liten)."
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "Reknar ut md5sum av kopier kjelde-«hdlist» (eller syntese)."
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "Mislykka kopiering av [%s] (md5summen stemmer ikkje)."
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "Feil ved lesing av syntesefil til mediet «%s»."
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "Leser rpm-filer frå [%s]."
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "Klarte ikkje lesa rpm-filer frå [%s]: %s."
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "Fann ingen rpm-filer frå [%s]."
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "Mottek kjelde-«hdlist» (eller syntese) til «%s» ..."
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "Fann undersøkt «hdlist» (eller syntese) som «%s»."
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "Reknar ut md5sum til motteken kjelde-«hdlist» (eller syntese)."
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr "md5summen stemmer ikkje."
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "Klarte ikkje henta kjelde-«hdlist» (eller syntese)."
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "Fann inga «hdlist»-fil for mediet «%s»."
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "Fila [%s] er allereie brukt i same mediet «%s»."
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "Klarte ikkje tolka «hdlist»-fila til «%s»."
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "Klarte ikkje skriva «list»-fila til «%s»."
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "Lagrar listefil for mediet «%s»."
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "Skreiv ingenting i listafila til «%s»."
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "Les offentlegnøkkelfila til «%s» ..."
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "... Importerer nøkkelen «%s» frå offentlegnøkkelfila til «%s»."
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "Klarte ikkje importera offentlegnøkkelfila til «%s»."
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "Les mediumhovud til mediet «%s»."
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "Byggjer «hdlist» [%s]"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "Fullført bygging av «hdlist»-syntesefil for mediet «%s»."
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "Fann %d hovudlinjer i mellomlageret."
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "Fjernar %d utdaterte hovudlinjer frå mellomlageret."
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "Monterer «%s»."
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "Avmonterer «%s»."
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "Flytta om %s oppføringar i avhengnadslista."
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "Flytta ikkje om nokon oppføringar i avhengnadslista."
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "Ugyldig rpm-filnamn [%s]."
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "Mottek rpm-fil [%s] ..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "Klarte ikkje lesa rpm-fil [%s]."
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "Klarte ikkje registrera rpm-fil."
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "Klarte ikkje registrera lokale pakkar."
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "Det finst ingen «%s»-pakke."
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Desse pakkane inneheld «%s»: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "Det finst fleire pakkar med same rpm-filnamn «%s»."
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "Klarte ikkje tolka [%s] på verdien «%s»."
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -706,62 +651,62 @@ msgstr ""
 "Mediet «%s» brukar ei ugyldig «list»-fil:\n"
 "Spegelen er truleg ikkje oppdatert. Prøver å bruka ein alternativ metode."
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "Mediet «%s» har ikkje adresseinformasjon for rpm-filer."
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "Fann ikkje pakken «%s»."
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi-databasen er låst."
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "Mediet «%s» er ikkje valt."
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "Klarte ikkje lesa rpm-fil [%s] frå mediet «%s»."
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "Det inkonsistente mediet «%s» er merkja fjerna, men er ikkje fjerna."
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "Klarte ikkje lesa mediet «%s»."
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "Ugyldig inndata: [%s]."
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "Mottek rpm-filer frå mediet «%s» ..."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "Førebur ... "
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "Brukar prosessen «%d» for transaksjon."
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -769,82 +714,97 @@ msgstr ""
 "Laga transaksjon for installering på «%s» (remove: %d – install: %d – "
 "upgrade: %d)"
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr "Klarte ikkje laga transaksjon."
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "Fjernar pakken «%s»."
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "Klarte ikkje fjerna pakken «%s»"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "Legg til pakken «%s» (id: %d – eid: %d – update: %d – file: %s)."
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "Klarte ikkje installera pakken «%s»"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "då «%s» manglar"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "då «%s» ikkje er tilfredsstilt"
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr "Prøver å prioritera «%s»"
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr "for å kunna behalda «%s»"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "for å kunna installera «%s»"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "på grunn av konfliktar med «%s»"
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr "ikkje etterspurd"
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Ugyldig signatur (%s)."
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "Ugyldig nøkkel-ID (%s)."
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Manglar signatur (%s)."
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "Ugyldig mellomtenardeklarasjon på kommandolinja.\n"
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: Klarer ikkje lesa rpm-fila «%s».\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Dårleg val. Prøv på nytt.\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -861,41 +821,41 @@ msgstr ""
 "\n"
 "Bruk:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         – Vis denne hjelpeteksten.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         – Vel automatisk pakkar ved fleire alternativ.\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr "  --test         – kontroller at installeringa kan fungera.\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 "  --force        – Tving gjennomføring sjølv om ikkje alle pakkar finst.\n"
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     – Distribuert urpmi over maskiner med alias.\n"
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         – Bruka anna rot for rpm-installering.\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -904,72 +864,62 @@ msgstr ""
 "  --use-distrib  – Set opp urpmi direkte frå eit «distrib»-tre.\n"
 "Nyttig for å (av)installera ei «chroot» med «--root»-valet.\n"
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             – Utvida meldingar.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             – Vel alle pakkar som samsvarer med uttrykket.\n"
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: Ukjent val «-%s». Sjå «--help» for oversikt over gyldige val.\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
-msgstr "Ukjende pakkar."
+msgstr "Ukjende pakkar"
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
-msgstr "Ukjend pakke."
+msgstr "Ukjend pakke"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "Du vil øydeleggja systemet viss du fjernar pakken «%s»."
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr "Ingenting å fjerna."
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "Kontrollerer fjerning av desse pakkane"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr "På grunn av avhengnader blir desse pakkane fjerna (%d MiB)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (J/N) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "Fjernar «%s»."
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr "Klarte ikkje fjerna."
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Dårleg val. Prøv på nytt.\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -986,39 +936,39 @@ msgstr ""
 "\n"
 "Bruk:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       – Bruk berre oppdateringsmedium.\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        – Bruk berre gitt medium (kommadelt liste).\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia – Ikkje bruk gitt medium (kommadelt liste).\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 "  --sortmedia    – Sorter medium etter delstrengar (kommadelt liste).\n"
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr "  --synthesis    – Bruk syntese i staden for heile databasen.\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      – Utvida meldingar.\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1028,87 +978,87 @@ msgstr ""
 "  --quiet        – Ikkje vis merkelappnamn. (Standard viss ingen merkelapp\n"
 "valt på kommandolinja. Ikkje kompatibel med interaktiv modus).\n"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --uniq         – Vis ikkje identiske linjer.\n"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all          – Vis alle merkelappar.\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group        – Vis merkelappen «group»: gruppe.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size         – Vis merkelappen «size»: storleik.\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --epoch        – Vis merkelappen «epoch»: epoke.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary      – Vis merkelappen «summary»: samandrag.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description  – Vis merkelappen «description»: beskriving.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr "  --sourcerpm    – Viss merkelappen «sourcerpm»: kjelde-rpm.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr "  --packager     – Vis merkelappen «packager»: pakkar.\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr "  --buildhost    – Vis merkelappen «buildhost»: byggjevert.\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --url          – Vis merkelappen «url»: url.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr "  --provides     – Vis merkelappen «provides»: alle tilbod.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr "  --requires     – Vis merkelappen «requires«»: alle krav.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files        – Vis merkelappen «files»: alle filer.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr "  --conflicts    – Vis merkelappen «conflicts»: alle konfliktar.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr "  --obsoletes    – Vis merkelappen «obsoletes»: alle erstattingar.\n"
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
@@ -1116,29 +1066,29 @@ msgid ""
 msgstr ""
 "  --env          – Bruk eigedefinert miljø (vanlegvis ein feilrapport).\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr "  -i             – Ikkje skil mellom store og små bokstavar.\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             – Vis versjon-, utgåve og arkitekturinformasjon.\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             – Ta med perl-kode direkte, som «perl -e».\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 "  -a             – Binær OG-operator. Sann viss begge uttrykka er sanne.\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
@@ -1146,24 +1096,24 @@ msgstr ""
 "  -o             – Binær ELLER-operator. Sann viss minst eitt av uttrykka er "
 "sanne.\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 "  !              – Unær IKKJE-operator. Sann viss og berre viss uttrykket er "
 "usant.\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr "  (              – Venstreparentes for opna gruppeuttrykk.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr "  )              – Høgreparentes for å lukka gruppeuttrykk.\n"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
@@ -1172,12 +1122,12 @@ msgstr ""
 "Tilbakekall:\n"
 "%s\n"
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "Brukar eigedefinert miljø på «%s»\n"
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1194,18 +1144,18 @@ msgstr ""
 "\n"
 "Bruk:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    – Bruk syntese i staden for heile databasen.\n"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  – Vel automatisk alle pakkar som kan oppdaterast.\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
@@ -1214,7 +1164,7 @@ msgstr ""
 "  --no-uninstall – Be aldri om å avinstallera ein pakke, men avbryt "
 "installeringa.\n"
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1223,7 +1173,7 @@ msgstr ""
 "  --keep         – Behald eksisterande pakkar viss mogleg. Ikkje installer\n"
 "                   pakkar som krev fjerning av andre pakkar.\n"
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1235,37 +1185,37 @@ msgstr ""
 "                   pakkar skal installerast eller oppdaterast. "
 "Standardverdi: %d.\n"
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length – Transaksjonslengd: Standardverdi: %d.\n"
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        – Bruk òg ikkje-ordrett søk (same som «-y»).\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          – Neste pakke er ein kjeldepakke (same som «-s»).\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  – Berre installer kjeldepakkar.\n"
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        – Fjern rpm-filer frå mellomlager først.\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      – Behald ikkje-brukte rpm-filer i mellomlager.\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1274,7 +1224,7 @@ msgstr ""
 "  --allow-nodeps – Tillèt å spørja brukarar å installera pakkar\n"
 "                   utan sjekking av avhengnader.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1283,7 +1233,7 @@ msgstr ""
 "  --allow-force  – Tillèt å spørja brukarar å installera pakkar\n"
 "                   utan sjekking av avhengnader og integritet.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1293,22 +1243,22 @@ msgstr ""
 "                   Nyttig for installering av ei «chroot» med «--root»-"
 "valet.\n"
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         – Bruk wget til å henta fjerntliggjande filer.\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         – Bruk curl til å henta fjerntliggjande filer.\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   – Avgrens nedlastingsfart.\n"
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1317,7 +1267,7 @@ msgstr ""
 "  --resume       – Ta opp att delvis nedlasta filer. (Bruk\n"
 "                   «--no-resume» for å slå av. Standard er avslått.)\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1326,7 +1276,7 @@ msgstr ""
 "  --proxy        – Bruk valt HTTP-mellomtenar. Standard portnummer: 1080.\n"
 "                   (Format: <tenarnamn[:port]>.)\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1335,19 +1285,19 @@ msgstr ""
 "  --proxy-user   – Vel brukar og passord for mellomtenar-\n"
 "                   autentisering. (Format: <brukar:passord>.)\n"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
 msgstr "  --bug          – Skriv feilrapport i mappa valt av neste argument.\n"
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            – Bruk X-grensesnitt.\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1356,7 +1306,7 @@ msgstr ""
 "  --best-output  – Vel automatisk det beste grensesnittet etter\n"
 "                   miljø: X eller tekstmodus.\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1366,74 +1316,63 @@ msgstr ""
 "                   (Bruk «--no-verify-rpm» til ikkje å kontrollera.\n"
 "                   Standard er å kontrollera,)\n"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  – Hopp over stig (kommadelt liste).\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  – Ikkje ta med hjelpefiler.\n"
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             – Vel alle treff på kommandolinja.\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             – Tillèt søk i tilbod for å finna pakkar.\n"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             – Ikkje søk i tilbod for å finna pakkar.\n"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             – Bruk òg ikkje-ordrett søk (same som «-fuzzy»).\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 "  -s             – Neste pakke er ein kjeldepakke (same som «--src»).\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             – Stillemodus.\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  Namn og rpm-filer valt på kommandolinja blir installerte.\n"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr "Vel plassering av lagra fil."
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "Ugyldig mellomtenardeklarasjon på kommandolinja.\n"
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: ukjent val: «%s». Sjå «--help» for meir informasjon.\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr "Kva som kan gjerast med binær-rpm-filer med «--install-src»"
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1454,22 +1393,22 @@ msgstr ""
 "\n"
 "Er du sikker på at du vil installera pakken?"
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "Ikkje gjer noko."
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr "Ja, installer pakken."
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr "Lagra fila."
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1484,12 +1423,12 @@ msgstr ""
 "\n"
 "Du kan òg velja å berre lagra han. Kva vil du gjera?"
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, c-format
 msgid "Install it"
 msgstr "Installer han."
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1498,42 +1437,42 @@ msgstr ""
 "Mappa [%s] finst allerie. Bruk ei anna mappe for feilrapport, eller slett "
 "denne."
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Klarte ikkje laga mappe [%s] for feilrapport."
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Berre superbrukaren kan installera pakkar."
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "Du treng éin av desse pakkane for å installera «%s»:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Du treng éin av desse pakkane:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Kven av dei vil du ha? (1–%d) "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "Installerer pakke ..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "Gjer klar ..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1542,12 +1481,12 @@ msgstr ""
 "Nokon av pakkane kan ikkje installerast:\n"
 "%s"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr "OK?"
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1558,7 +1497,7 @@ msgstr ""
 "for at andre skal kunna oppdaterast:\n"
 "%s\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1567,14 +1506,14 @@ msgstr ""
 "Desse pakkane må fjernast for at andre skal kunna oppgraderast:\n"
 "%s"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr "Grunna avhengnader blir desse pakkane installerte (%d MiB)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1583,37 +1522,47 @@ msgstr ""
 "Du må vera «root»-brukar for å kunna installera desse avhengnadene:\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "Fann ikkje kjeldepakke. Avbryter."
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Set inn mediet «%s» i eininga [%s]."
+msgstr "Set inn «%s» i eininga [%s]."
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Trykk så «Enter» ..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Lastar ned pakken «%s» ..."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% av %s motteken. Tid igjen: %s. Fart: %s."
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% motteken. Fart: %s."
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
-msgstr "Desse pakkane har ugyldige signaturar."
+msgstr "Desse pakkane har ugyldige signaturar"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Vil du halda fram med å installera?"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1624,57 +1573,57 @@ msgstr ""
 "%s\n"
 "Du bør oppdatera urpmi-databasen."
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "Feil ved installering."
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr "Fordeler %s."
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr "Installerer %s."
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Installerer pakken «%s» (%s/%s) ..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Vil du installera utan å kontrollera avhengnader? (J/N) "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Vil du prøva endå sterkare å installera («--force»)? (J/N) "
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d mislykka installasjonstransaksjon."
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "Det går an å installera."
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "Alt er allereie installert."
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr "Startar urpmi på nytt."
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1699,29 +1648,29 @@ msgstr ""
 "\n"
 "og [val] er av desse:\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       – Lag oppdateringsmedium.\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr "  --probe-synthesis – Prøv å finna og bruka syntesefil.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr "  --probe-hdlist – Prøv å finna og bruka «hdlist»-fil.\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
 "                   hdlist file.\n"
 msgstr "  --no-probe     – Ikkje prøv å finna syntese eller «hdlist»-fil.\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -1730,7 +1679,7 @@ msgstr ""
 "  --distrib      – Lag automatisk alle medium frå\n"
 "                   eit installasjonsmedium.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1742,7 +1691,7 @@ msgstr ""
 "                   «XXX» kan vera «main», «contrib», «updates» eller\n"
 "                   noko anna som er sett opp.\n"
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1751,7 +1700,7 @@ msgstr ""
 "  --from         – Bruk valt adresse for liste over speglar.\n"
 "                   Standardverdi: %s.\n"
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1762,7 +1711,7 @@ msgstr ""
 "installert\n"
 "                   «mandrake-release»-pakke blir brukt som standard.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
@@ -1772,7 +1721,7 @@ msgstr ""
 "installert\n"
 "                   «mandrake-release»-pakke blir brukt som standard.\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
@@ -1781,73 +1730,52 @@ msgstr ""
 "  --virtual      – Lag virtuelt medium som alltid er oppdatert.\n"
 "                   Berre «file://»-protokollen er støtta.\n"
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    – Ikkje bruk md5sum-kontroll.\n"
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             – Tøm hovudlinjemellomlageret.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             – Lag alltid «hdlist»-filer.\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"Ukjende val: «%s».\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "Kan ikkje leggja til oppdateringar til «cooker»-distribusjonar.\n"
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "Mottek spegelliste frå «%s» ..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"Treng ikkje oppgi «relativ stig til «hdlist»> med «--distrib»-valet"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "Treng ikkje oppgi «relativ stig til «hdlist»> med «--distrib»-valet"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "Klarte ikkje oppdatera mediet «%s».\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"Manglar <relativ stig til «hdlist»>.\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "Manglar <relativ stig til «hdlist»>.\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"Manglar «with» for nettverksmedium.\n"
+msgid "`with' missing for network media\n"
+msgstr "Manglar «with» for nettverksmedium.\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "Klarte ikkje laga mediet «%s».\n"
@@ -1866,6 +1794,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             – Vel alle medium.\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"Ukjende val: «%s».\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1882,7 +1819,7 @@ msgstr ""
 "Manglar oppføringa som skal fjernast.\n"
 "(Skal vera ein av: %s.)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1891,29 +1828,29 @@ msgstr ""
 "Bsage: urpmi.update [val] <namn> ...\n"
 "der <namn> er namnet på mediet som skal oppdaterast.\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       – Berre oppdater oppdateringsmedium.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr "  --force-key    – Tving oppdatering av PGP-nøkkel.\n"
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             – Vel alle ikkje-fjernbare medium.\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "Det finst ingenting å oppdatera. (Bruk «urpmi.addmedia» til å leggja til "
 "medium.)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1922,7 +1859,7 @@ msgstr ""
 "Manglar oppføringa som skal oppdaterast\n"
 "(éin av %s)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1939,23 +1876,23 @@ msgstr ""
 "\n"
 "Bruk:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         – Vis oversikt over tilgjengelege pakkar.\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   – Vis oversikt over tilgjengelege medium.\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr ""
 "  --list-url     – Vis oversikt over tilgjengelge medium, med adresser.\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
@@ -1963,17 +1900,17 @@ msgstr ""
 "  --dump-config  – Dump oppsettet på same form som «urpmi.addmedia»-"
 "argument.\n"
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr "  --list-nodes   – Vis tilgjengelege nodar ved bruk av «--parallel».\n"
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases – Vis oversikt over tilgjengelege parallellalias.\n"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
@@ -1982,7 +1919,7 @@ msgstr ""
 "  --headers      – Hent ut hovudlinjer for pakken, frå urpmi-databasen\n"
 "til standard-ut (berre for «root»-brukaren).\n"
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
@@ -1990,7 +1927,7 @@ msgstr ""
 "  --sources      – Gi alle kjeldepakkar før nedlasting (berre for «root»-"
 "brukar).\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
@@ -1999,17 +1936,17 @@ msgstr ""
 "  --use-distrib  – Set opp urpmi direkte frå eit distribusjonstre.\n"
 "                   Med dette kan du gjera spørjingar på ein distribusjon.\n"
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    – Vis endringslogg.\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             – Utvid spørjing til pakkeavhengnader.\n"
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -2018,53 +1955,106 @@ msgstr ""
 "  -u             – Fjern pakkar viss nyare versjonar allereie er "
 "installerte.\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 "  -c             – Fullstendig oversikt over pakken som skal fjernast.\n"
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             – Omvendt søk etter kva som krev pakken.\n"
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -i             – Vis nyttig informasjon i lettlesbart format.\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             – Vis òg grupper med namnet.\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             – Vis òg versjonsinformasjon med namnet.\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             – Vis oversikt over filer i pakken.\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  namn og rpm-filer gitt på kommandolinja blir førespurd.\n"
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: Ukjend val: «-%s». Sjå «--help» for meir informasjon.\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: Klarer ikkje lesa rpm-fila «%s».\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "Kan berre bruka «--list-nodes« saman med «--parallel»."
+
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "Ukjent «webfetch» «%s».\n"
+
+#~ msgid "copy failed: %s"
+#~ msgstr "Feil ved kopiering: %s."
+
+#~ msgid "wget is missing\n"
+#~ msgstr "«wget» manglar.\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "Mislukka «wget»: Avslutta med %d eller signalet %d.\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "«curl» manglar.\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "Mislukka «curl»: avslutta med %d eller signalet %d.\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "«rsync» manglar.\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "Mislukka «rsync»: avslutta med %d eller signalet %d.\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "«ssh» manglar.\n"
+
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpme: Ukjent val «-%s». Sjå «--help» for oversikt over gyldige val.\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmi: ukjent val: «%s». Sjå «--help» for meir informasjon.\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr "Grunna avhengnader blir desse pakkane installerte (%d MiB)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "Treng ikkje oppgi «relativ stig til «hdlist»> med «--distrib»-valet"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "Manglar <relativ stig til «hdlist»>.\n"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "Manglar «with» for nettverksmedium.\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmq: Ukjend val: «-%s». Sjå «--help» for meir informasjon.\n"
diff --git a/po/pl.po b/po/pl.po
index 635b8cc0..55dd8d2d 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2004-02-02 10:12+0100\n"
 "Last-Translator: Arkadiusz Lipiec <arkadiusz.lipiec@gazeta.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -48,22 +48,22 @@ msgstr ""
 "Automatyczna instalacja pakietów...\n"
 "Zgłoszono polecenie instalacji pakietu %s\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "W porządku?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (T/n) "
@@ -73,7 +73,7 @@ msgstr " (T/n) "
 msgid "%s: command not found\n"
 msgstr "%s: polecenie nie zostało odnalezione\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
@@ -82,114 +82,53 @@ msgstr ""
 "użycie: %s [opcje]\n"
 "gdzie [opcjami] mogą być\n"
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - wyświetla ten komunikat pomocy.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "  -g [group]      - ogranicza wyniki do zadanej grupy.\n"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, c-format
 msgid "                    defaults is %s.\n"
 msgstr "                    domyślną wartością jest %s.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Nieznany typ pobierania `%s' !!!\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "nieznany protokół zdefiniowany dla %s"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "nie znaleziono narzędzia do pobierania stron, obsługiwanymi są: %s\n"
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "nie można obsłużyć protokołu: %s"
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "kopiowanie nie powiodło się: %s"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "brak programu wget\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "błąd wget: wyjście z wartością %d lub sygnałem %d\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "brak programu curl\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "błąd curl: wyjście z wartością %d lub sygnałem %d\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "brak programu rsync\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "błąd rsync: wyjście z wartością %d lub sygnałem %d\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "brak ssh\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% z %s gotowe, ETA = %s, szybkość = %s"
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% gotowe, szybkość = %s"
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...pobieranie nie powiodło się: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "błąd składni pliku konfiguracyjnego w wierszu %s"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 "nośnik \"%s\" próbuje używać wykorzystany już plik hdlist, zignorowano nośnik"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr "nośnik \"%s\" próbuje użyć już wykorzystaną listę, zignorowano nośnik"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -197,43 +136,43 @@ msgid ""
 msgstr ""
 "Nie można sprawdzić \"%s\" gdyż plik listy jest używany przez inny nośnik "
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 "nie można użyć nazwy \"%s\" dla nienazwanego nośnika, ponieważ jest ona już "
 "używana"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 "nie można przypisać nośnika \"%s\" do konta, gdyż nie istnieje plik listy [%"
 "s]"
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "nie można określić nośnika związanego z tym plikiem hdlist [%s]"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "nie można uzyskać dostępu do pliku hdlist \"%s\", zignorowano nośnik"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 "nie można uzyskać dostępu do pliku listy związanego z \"%s\", zignorowano "
 "nośnik"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "próba przełączenia istniejącego nośnika \"%s\", anulowano"
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -242,93 +181,93 @@ msgstr ""
 "wirtualny nośnik \"%s\" nie powinien posiadać zdefiniowanego pliku hdlist "
 "lub listy, zignorowano nośnik"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr ""
 "wirtualny nośnik \"%s\" powinien posiadać jasny url, zignorowano nośnik"
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "nie można znaleźć pliku hdlist dla \"%s\" nośnik zignorowano"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "nie można znaleźć pliku listy dla \"%s\", nośnik zignorowano"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "niespójny plik listy dla \"%s\", nośnik zignorowano"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "nie można zbadać pliku listy związanego z \"%s\", nośnik zignorowano"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "zbyt dużo punktów montowania dla wymiennego nośnika \"%s\""
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "traktowanie napędu wymiennego jako \"%s\""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "używanie innego urządzenia wymiennego [%s] dla \"%s\""
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "nie można pobrać ścieżki dla nośnika wymiennego \"%s\""
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "nie można zapisać pliku konfiguracyjnego [%s]"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "zapisywanie pliku konfiguracyjnego [%s]"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "Nie można użyć trybu zrównoleglenia z trybem use-distrib"
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "nie można przetworzyć \"%s\" w pliku [%s]"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "badanie równoległej funkcji obsługi w pliku [%s]"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "znaleziono równoległą funkcję obsługi dla węzłów: %s"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "użycie nośnika przypisanego dla trybu równoległego: %s"
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "nie można użyć równoległej opcji \"%s\""
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -337,90 +276,90 @@ msgstr ""
 "opcja --synthesis nie może być używana z opcją --media, --excludemedia, --"
 "sortmedia, --update lub --parallel"
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "sprawdzanie pliku syntezy [%s]"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "badanie pliku hdlist [%s]"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "wirtualny nośnik \"%s\" nie jest lokalny, zignorowano nośnik"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "wystąpił problem podczas odczytu pliku syntezy dla nośnika \"%s\""
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "podejmowanie kolejnej operacji obliczenia zależności\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "pomijanie pakietu %s"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "mogłoby to spowodować zainstalowanie zamiast uaktualnienia pakietu %s"
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "nie można otworzyć bazy danych rpm"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "nośnik \"%s\" już istnieje"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr "nośnik wirtualny musi być lokalny"
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "dodany nośnik %s"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "brak dostępu do pierwszego nośnika instalacyjnego"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "kopiowanie pliku hdlist..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "...kopiowanie zakończone niepowodzeniem"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "...kopiowanie zakończone"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
@@ -429,43 +368,49 @@ msgstr ""
 "brak dostępu do pierwszego nośnika instalacyjnego (nie znaleziono pliku "
 "Mandrake/base/hdlists)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "pobieranie pliku hdlist..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "...pobieranie zakończone"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...pobieranie nie powiodło się: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "niepoprawny opis hdlist \"%s\" w pliku hdlist"
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "próba wyboru nieistniejącego nośnika \"%s\""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "wybieranie wielu nośników: %s"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "usuwanie nośnika \"%s\""
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -476,7 +421,7 @@ msgstr ""
 "To może się zdarzyć jeśli podczas tworzenia nośnika katalog został "
 "zamontowany ręcznie."
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -485,224 +430,224 @@ msgstr ""
 "wirtualny nośnik \"%s\" powinien posiadać poprawny plik źródłowy hdlist lub "
 "syntezy, zignorowano nośnik"
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "kopiowanie pliku opisowego związanego z \"%s\"..."
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "obliczanie sumy md5 istniejącego pliku źródłowego hdlist (lub syntezy)"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "badanie pliku MD5SUM"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "kopiowanie źródła hdlist (lub syntezy) związanego z \"%s\"..."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "kopiowanie [%s] zakończone niepowodzeniem (plik jest podejrzanie mały)"
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "obliczanie sumy md5 skopiowanego źródłowego pliku hdlist (lub syntezy)"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "kopiowanie [%s] zakończone niepowodzeniem (niezgodna suma md5)"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "wystąpił problem podczas odczytu pliku syntezy dla nośnika \"%s\""
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "odczytywanie plików rpm z [%s]"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "nie można czytać plików rpm z [%s]: %s"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "nie znaleziono żadnych plików rpm z [%s]"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 "pobieranie pliku źródłowego hdlist (lub syntezy) związanego z \"%s\"..."
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "znaleziono zbadany plik hdlist (lub synthesis) jako %s"
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "obliczanie sumy md5 pobranego pliku źródłowego hdlist (lub syntezy)"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr "niezgodność sumy md5"
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr ""
 "pobieranie pliku źródłowego hdlist (lub syntezy) zakończone niepowodzeniem"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "nie znaleziono pliku hdlist dla nośnika \"%s\""
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "plik [%s] już został użyty w tym samym nośniku \"%s\""
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "nie można przetworzyć pliku hdlist związanego z \"%s\""
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "nie można zapisać pliku listy związanego z \"%s\""
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "zapisywanie pliku listy dla nośnika \"%s\""
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "nic nie zostało zapisane do pliku listy dla \"%s\""
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "sprawdzanie pliku klucza publicznego związanego z \"%s\"..."
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...zaimportowany klucz %s z klucza publicznego związanego z \"%s\""
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "nie można zaimportować pliku klucza publicznego związanego z \"%s\""
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "odczytywanie nagłówków z nośnika \"%s\""
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "budowanie pliku hdlist [%s]"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "zbudowano plik syntezy dla nośnika \"%s\""
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "znaleziono %d nagłowków w pamięci podręcznej"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "usuwanie %d przestarzałych nagłowków w pamięci cache"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "montowanie %s"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "odmontowywanie %s"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "relokowano %s wpisów w liście zależności deplist"
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "żaden wpis nie został relokowany na liście zależności deplist"
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "niepoprawna nazwa pliku rpm [%s]"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "pobieranie pliku rpm [%s] ..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "nie można uzyskać dostępu do pliku rpm [%s]"
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "nie można zarejestrować pliku rpm"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "błąd w trakcie rejestrowania pakietów lokalnych"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "brak pakietu o nazwie %s"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Następujące pakiety zawierają %s: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "Istnieje wiele pakietów o tej samej nazwie pliku rpm \"%s\""
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "nie można poprawnie przetworzyć [%s] przy wartości \"%s\""
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -712,62 +657,62 @@ msgstr ""
 "serwer zwierciadlany jest prawdopodobnie nieaktualny,\n"
 "próba wykorzystania metody alternatywnej"
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "nośnik \"%s\" nie określa żadnej lokalizacji dla plików rpm"
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "pakiet %s nie został odnaleziony."
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "baza danych urpmi jest zablokowana"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "nośnik \"%s\" nie został wybrany"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "nie można czytać pliku rpm [%s] z nośnika \"%s\""
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "niespójny nośnik \"%s\" zaznaczony jako wymienny ale niekoniecznie"
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "nie można uzyskać dostępu do nośnika \"%s\""
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "niepoprawne wejście: [%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "pobieranie plików rpm z nośnika \"%s\"..."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "Przygotowywanie..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "użycie procesu %d do uruchomienia transakcji"
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -775,82 +720,97 @@ msgstr ""
 "utworzono transakcję dla instalacji na %s (usuwanie=%d, instalacja=%d, "
 "aktualizacja=%d)"
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr "nie można utworzyć transakcji"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "usuwanie pakietu %s"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "nie można usunąć pakietu %s"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "dodawanie pakietu %s (id=%d, eid=%d, aktualizacja=%d, plik=%s)"
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "nie można zainstalować pakietu %s"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "z powodu brakującego %s"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "z powodu niesatysfakcjonującego pakietu %s"
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr "próba ulepszenia %s"
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr "w celu zachowania pakietu %s"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "w celu zainstalowania pakietu %s"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "z powodu kolizji z pakietem %s"
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr "niezgłoszony"
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Niepoprawny podpis (%s)"
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "Niepopwawny identyfikator klucza (%s)"
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Brakujący podpis (%s)"
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "niepoprawna deklaracja serwera pośredniczącego w wierszu poleceń\n"
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: nie można odczytać pliku rpm \"%s\"\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Niestety, niepoprawny wybór, spróbuj ponownie\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -867,18 +827,18 @@ msgstr ""
 "\n"
 "użycie:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - wyświetla ten komunikat pomocy.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - automatycznie wybiera najlepszy pakiet z listy.\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
@@ -886,7 +846,7 @@ msgstr ""
 "  --test         - sprawdza, czy instalacja zostanie przeprowadzona "
 "prawidłowo.\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
@@ -894,17 +854,17 @@ msgstr ""
 "  --force        - wymusza wywoływanie nawet przy braku niektórych "
 "pakietów.\n"
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - rozproszone urpmi z użyciem komputerów aliasu.\n"
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - używa innego katalogu głównego do instalacji rpm.\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -913,73 +873,63 @@ msgstr ""
 "  --use-distrib  - konfiguruje urpmi w locie z drzewa dystrybucyjnego,\n"
 "                   użyteczne przy (od)instalowywania chroot z opcją --root.\n"
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - tryb komunikatywny.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - wybiera wszystkie pasujące pakiety.\n"
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: nieznana opcja \"-%s\", sprawdź wywołanie z opcją --help\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr "nieznane pakiety"
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "nieznany pakiet"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "usuwanie pakietu %s spowoduje uszkodzenie systemu"
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr "Brak elementów do usunięcia."
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "Zaznaczanie do usunięcia następujących pakietów"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
 "W celu spełnienia zależności zostaną usunięte następujące pakiety (%d MB)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (y/N) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "usuwanie %s"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr "Usuwanie zakończone niepowodzeniem"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Niestety, niepoprawny wybór, spróbuj ponownie\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -996,26 +946,26 @@ msgstr ""
 "\n"
 "użycie:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - używa tylko nośników aktualizacyjnych.\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 "  --media        - używa tylko podanych nośników, rozdzielonych "
 "przecinkami.\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 "  --excludemedia - bez używania podanych nośników, rozdzielonych "
 "przecinkami.\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1023,17 +973,17 @@ msgstr ""
 "  --sortmedia    - sortuje nośniki w zależności od podciągów rozdzielonych\n"
 "                   przecinkami.\n"
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr "  --synthesis    - używa pliku syntezy podanego zamiast bazy urpmi.\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - tryb komunikatywny.\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1043,92 +993,92 @@ msgstr ""
 "  --quiet         - bez wyświetlania nazwy znacznika\n"
 "                    (domyślny tryb jeśli nie podano znacznika w wierszu).\n"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --uniq         - bez wyświetlania identycznych wierszy.\n"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all           - wyświetla wszystkie znaczniki.\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group         - wyświetla znacznik group: grupa.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size          - wyświetla znacznik size: rozmiar.\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --epoch        - wyświetla znacznik epoch: iteracja.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary       - wyświetla znacznik summary: zestawienie.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description   - wyświetla znacznik description: opis.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr "  --sourcerpm    - wyświetla znacznik sourcerpm: źródło rpm.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr ""
 "  --packager     - wyświetla znacznik packager: osoba tworząca pakiet.\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr ""
 "  --buildhost    - wyświetla znacznik buildhost: komputer budujący pakiet.\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --url          - wyświetla znacznik url: adres url.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr "  --provides     - wyświetla zanacznik provides: wszyst. pakiety.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr ""
 "  --requires     - wyświetla znacznik requires: wszystkie zależności.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files        - wyświetla znacznik files: wszystkie pliki.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr ""
 "  --conflicts    - wyświetla znacznik conflicts: wszystkie konflikty.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr ""
 "  --obsoletes    - wyświetla znacznik obsoletes: wszystkie przestarzałe.\n"
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
@@ -1136,22 +1086,22 @@ msgid ""
 msgstr ""
 "  --env          - używa określonego środowiska (typowo raport błędów).\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr "  -i             - ignoruje wielkość liter we wszystkich wzorcach.\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - wyświetla wersję, wydanie oraz archiwum z nazwą.\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - dołącza kod perla bezpośrednio jako perl -e.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
@@ -1159,7 +1109,7 @@ msgstr ""
 "  -a             - operator binarny AND, prawda gdy oba wyrażenia "
 "prawdziwe.\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
@@ -1167,22 +1117,22 @@ msgstr ""
 "  -a             - operator binarny AND, prawda gdy jedno wyrażenie "
 "prawdziwe.\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !             - modyfikator NOT, prawda jeśli wyrażenie fałszywe.\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr "  (              - lewy nawias do otwierania wyrażenia grupowego.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr "  )              - prawy nawias do zamykania wyrażenia grupowego.\n"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
@@ -1191,12 +1141,12 @@ msgstr ""
 "wywołanie zwrotne jest :\n"
 "%s\n"
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "używając określonego środowiska na %s\n"
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1213,19 +1163,19 @@ msgstr ""
 "\n"
 "użycie:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - używa podanego pliku syntezy zamiast bazy urpmi.\n"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 "  --auto-select  - automatycznie wybiera pakiety aktualizujące system.\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
@@ -1234,7 +1184,7 @@ msgstr ""
 "  --no-uninstall - nigdy nie pyta o odinstalowanie pakietu, przerywa "
 "instalację.\n"
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1243,7 +1193,7 @@ msgstr ""
 "  --keep         - zachowuje, jeśli to możliwe, istniejące pakiety\n"
 "                   odrzuca żądane pakiety prowadzące do usunięcia innych.\n"
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1254,40 +1204,40 @@ msgstr ""
 "                   zainstalowana lub uaktualniona większa liczba\n"
 "                   pakietów niż zadana, domyślną wartością jest %d.\n"
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - mały rozmiar transakcji, domyślna wartość to %d.\n"
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - wymusza wyszukiwanie niespójności (tak jak -y).\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 "  --src          - następny pakiet jest pakietem źródłowym (tak jak -s).\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - instaluje tylko pakiet źródłowy (bez binariów).\n"
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 "  --clean        - zaczyna od usuwania plików rpm z pamięci podręcznej.\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr ""
 "  --noclean      - zachowuje pliki rpm nie używane w pamięci podręcznej.\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1296,7 +1246,7 @@ msgstr ""
 "  --allow-nodeps - umożliwia użytkownikownikowi, który sobie zażyczy,\n"
 "                   instalację pakietów bez sprawdzania zależności.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1306,7 +1256,7 @@ msgstr ""
 "                   instalację pakietów bez sprawdzania zależności\n"
 "                   i spójności.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1315,22 +1265,22 @@ msgstr ""
 "  --use-distrib  - konfiguruje urpmi w locie z drzewa dystrybucyjnego,\n"
 "                   opcja użyteczna przy instalacji chroot z opcją --root.\n"
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - używa wgeta do pobierania zdalnych plików.\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - używa curla do pobierania zdalnych plików.\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - ogranicza szybkość pobierania.\n"
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1339,7 +1289,7 @@ msgstr ""
 "  --resume       - wznawia przesyłanie częściowo porabnych plików\n"
 "                   (--no-resume wyłącza funkcję, domyślnie wyłączoną).\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1348,7 +1298,7 @@ msgstr ""
 "  --proxy        - używa wybranego pośrednika HTTP, domyślnym portem\n"
 "                   jest port 1080 (format <serwerproxy[:port]>).\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1357,7 +1307,7 @@ msgstr ""
 "  --proxy-user   - określa użytkownika i hasło używane do uwierzytelnienia\n"
 "                   na serwerze pośredniczącym (format <użytkownik:hasło>)\n"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1366,12 +1316,12 @@ msgstr ""
 "  --bug          - raport błędów w katalogu wskazanym przez\n"
 "                   następny argument\n"
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - używa interfejsu X Window.\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1380,7 +1330,7 @@ msgstr ""
 "  --best-output  - wybiera najlepszy interfejs w zależności od środowiska:\n"
 "                   X Window lub tryb tekstowy.\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1389,78 +1339,67 @@ msgstr ""
 "  --verify-rpm   - bada podpis cyfrowy pakietu przed instalacją.\n"
 "                   (--no-verify-rpm wyłącza, domyślnie włączone).\n"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - wyłącza ścieżki oddzielone przecinkami.\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - wyłącza pliki dokumentacji.\n"
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - wybiera wszystkie dopasowania w wierszu poleceń.\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 "  -p             - umożliwia wyszukiwanie serwerów przy szukaniu pakietów.\n"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 "  -P             - nie przeszukuje serwerów przy wyszukiwaniu pakietów.\n"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 "  -y             - wymusza wyszukiwanie niespójności (tak jak --fuzzy).\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 "  -s             - następny pakiet jest pakietem źródłowym (tak jak --src).\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - tryb cichy.\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 "  nazwy lub pliki rpm podane w wierszu poleceń zostaną zainstalowane.\n"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr "Wybierz miejsce zapisania pliku"
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "niepoprawna deklaracja serwera pośredniczącego w wierszu poleceń\n"
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: nieznana opcja \"-%s\", sprawdź wywołanie z opcją --help\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr "Co można zrobić z binarnymi plikami rpm przy użyciu --instal-src"
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1481,22 +1420,22 @@ msgstr ""
 "\n"
 "Co chcesz zrobić?"
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "Nic nie rób"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr "Tak, naprawdę zainstaluj go"
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr "Zapisz plik"
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1511,12 +1450,12 @@ msgstr ""
 "\n"
 "Być może będziesz mieć ochotę go zapisać. Jaki jest twój wybór?"
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, c-format
 msgid "Install it"
 msgstr "Zainstaluj go"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1525,42 +1464,42 @@ msgstr ""
 "Katalog [%s] już istnieje, użyj innego katalogu do zgłoszenia błędu lub go "
 "usuń"
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "nie można utworzyć katalogu [%s] dla raportu o błędach"
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Tylko administrator ma prawo instalować pakiety"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "Jeden z poniższych pakietów musi zostać zainstalowany %s:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Wymagany jest jeden z następujących pakietów:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Jaki jest Twój wybór? (1-%d) "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "Instalacja pakietu..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "Inicjalizacja..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1569,12 +1508,12 @@ msgstr ""
 "Niektóre z wybranych pakietów nie mogą zostać zainstalowane:\n"
 "%s"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr "czy się zgadzasz ?"
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1585,7 +1524,7 @@ msgstr ""
 "muszą zostać usunięte aby zaktualizować inne:\n"
 "%s\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1594,16 +1533,16 @@ msgstr ""
 "Poniższe pakiety muszą być usunięte aby zaktualizować inne:\n"
 "%s"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
 "Zostaną zainstalowane następujące pakiety w celu spełnienia zależności (%d "
 "MB)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1612,37 +1551,47 @@ msgstr ""
 "Aby zainstalować następujące zależności należy zrobić to z konta roota:\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "nie można pobrać pakietów źródłowych, zaniechanie"
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Włóż nośnik o nazwie \"%s\" do napędu [%s]"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Naciśnij enter jeśli jesteś gotowy(-a)..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Pobieranie pakietu \"%s\"..."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% z %s gotowe, ETA = %s, szybkość = %s"
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% gotowe, szybkość = %s"
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Następujące pakiety zawierają niepoprawne podpisy"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Czy chcesz kontynuować instalację ?"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1653,57 +1602,57 @@ msgstr ""
 "%s\n"
 "Może zachodzić potrzeba aktualizacji bazy danych urpmi"
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "Instalacja nie powiodła się"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr "rozpowszechnianie %s"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr "instalowanie %s"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instalowanie pakietu \"%s\" (%s/%s)..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Próbować instalować bez sprawdzania zależności? (t/N) "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Czy chesz spróbować wymusić instalację (--force)? (t/N) "
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d transakcji instalacyjnych zakończonych niepowodzeniem"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "Instalacja jest możliwa"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "wszystko zostało już zainstalowane"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr "ponownie uruchamianie urpmi"
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1728,22 +1677,22 @@ msgstr ""
 "\n"
 "zaś [opcje] mogą przyjmować wartości\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - tworzy nośnik aktualizacyjny.\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr "  --probe-synthesis - próbuje znaleźć i użyć plik syntezy.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr "  --probe-hdlist - próbuje znaleźć i użyć plik hdlist.\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
@@ -1752,7 +1701,7 @@ msgstr ""
 "  --no-probe     - bez próby odnalezienia żadnego pliku syntezy\n"
 "                   lub hdlist.\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -1761,7 +1710,7 @@ msgstr ""
 "  --distrib      - automatycznie tworzy wszystkie nośniki z nośnika\n"
 "                   instalacyjnego.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1772,7 +1721,7 @@ msgstr ""
 "                   XXX może mieć wartość main, contrib, updates lub\n"
 "                   cokolwiek innego co zostało skonfigurowane ;-)\n"
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1781,7 +1730,7 @@ msgstr ""
 "  --from         - używa określonego adresu url z listy mirrorów, domyślnie\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1791,7 +1740,7 @@ msgstr ""
 "  --version      - używa określonej wersji dystrybucji, domyślną wersją\n"
 "                   jest wersja zainstalowanego pakietu mandrake-release.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
@@ -1800,7 +1749,7 @@ msgstr ""
 "  --arch         - używa określonej architektury, domyślną jest\n"
 "                   architektura zinstalowanego pakietu mandrake-release.\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
@@ -1809,74 +1758,54 @@ msgstr ""
 "  --virtual      - tworzy nośniki, które są zawsze aktualne,\n"
 "                   dozwolony jest tylko protokół file://.\n"
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 "  --no-md5sum    - wyłącza sprawdzanie sumy kontrolnej MD5 dla pliku.\n"
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - czyści katalog nagłówków pamięci podręcznej.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - wymusza generację plików hdlist.\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"nieznane opcje \"%s\"\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "nie można dodać aktualizacji dystrybucji cooker\n"
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "pobieranie serwerów pośredniczących z %s ..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr ""
-"%s\n"
 "nie ma potrzeby podawania <ścieżki_względnej lub hdlisty> z opcją --distrib"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "nie można zaktualizować nośnika \"%s\"\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"brak <ścieżki względnej do pliku hdlist>\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "brak <ścieżki względnej do pliku hdlist>\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"brakujący parametr \"with\" dla nośnika sieciowego\n"
+msgid "`with' missing for network media\n"
+msgstr "brakujący parametr \"with\" dla nośnika sieciowego\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "nie można utworzyć nośnika \"%s\"\n"
@@ -1895,6 +1824,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - wybiera wszystkie nośniki.\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"nieznane opcje \"%s\"\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1909,7 +1847,7 @@ msgstr ""
 "brak wpisu do usunięcia\n"
 "(jeden z %s)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1918,28 +1856,28 @@ msgstr ""
 "użycie: urpmi.update [opcje] <nazwa> ...\n"
 "gdzie <nazwa> jest nazwą nośnika do aktualizacji.\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - używa tylko nośników aktualizacyjnych.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr "  --force-key    - wymusza aktualizację klucza gpg.\n"
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - wybiera wszystkie niewymienne nośniki.\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "brak elementów do aktualizacji (użyj urpmi.addmedia aby dodać nośnik)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1948,7 +1886,7 @@ msgstr ""
 "brak wpisu do aktualizacji\n"
 "(jeden z %s)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1965,41 +1903,41 @@ msgstr ""
 "\n"
 "użycie:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - wypisuje dostępne pakiety.\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - wypisuje dostępne nośniki.\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url   - wypisuje dostępne nośniki i ich url-e.\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 "  --dump-config  - zrzuca konfigurację w postaci urpmi.addmedia argument.\n"
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 "  --list-nodes   - wypisuje dostępne węzły gdy używana jest opcja --"
 "parallel.\n"
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases    - wypisuje dostępne równoległe aliasy.\n"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
@@ -2008,7 +1946,7 @@ msgstr ""
 "  --headers      - wybiera nagłówki z pakietu wypisane z bazy danych urpmi\n"
 "                   na wyjście standardowe (tylko root).\n"
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
@@ -2016,7 +1954,7 @@ msgstr ""
 "  --sources      - wypisuje wszystkie pakiety źródłowe przed pobraniem\n"
 "                   (tylko root).\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
@@ -2025,17 +1963,17 @@ msgstr ""
 "  --use-distrib  - konfiguruje urpmi w locie z drzewa dystrybucyjnego.\n"
 "                   Ta opcja pozwala na odpytywanie dystrybucji.\n"
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - wyświetla dziennik zmian.\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - rozszerza zapytania o zależności międzypakietowe.\n"
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -2043,56 +1981,111 @@ msgid ""
 msgstr ""
 "  -u             - usuwa pakiet jeśli jest już zainstalowana lepsza wersja.\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - zapełnia wyjście pakietami do usunięcia.\n"
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - wyszukiwanie odwrotne tego co wymaga pakietu.\n"
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 "  -i             - wyświetla użyteczne informacje w czytelnej formie.\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - wyświetla grupy wraz z ich nazwami.\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - wyświetla wersję i wydanie wraz z nazwą.\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - wypisuje pliki w pakiecie.\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  żądanie dotyczące nazw lub plików podanych w wierszu poleceń.\n"
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: nieznana opcja \"-%s\", sprawdź użycie z opcją --help\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: nie można odczytać pliku rpm \"%s\"\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes może być użyta tylko z opcją --parallel"
 
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "Nieznany typ pobierania `%s' !!!\n"
+
+#~ msgid "copy failed: %s"
+#~ msgstr "kopiowanie nie powiodło się: %s"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "brak programu wget\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "błąd wget: wyjście z wartością %d lub sygnałem %d\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "brak programu curl\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "błąd curl: wyjście z wartością %d lub sygnałem %d\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "brak programu rsync\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "błąd rsync: wyjście z wartością %d lub sygnałem %d\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "brak ssh\n"
+
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpme: nieznana opcja \"-%s\", sprawdź wywołanie z opcją --help\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmi: nieznana opcja \"-%s\", sprawdź wywołanie z opcją --help\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr ""
+#~ "Zostaną zainstalowane następujące pakiety w celu spełnienia zależności (%"
+#~ "d MB)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "nie ma potrzeby podawania <ścieżki_względnej lub hdlisty> z opcją --"
+#~ "distrib"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "brak <ścieżki względnej do pliku hdlist>\n"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "brakujący parametr \"with\" dla nośnika sieciowego\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpme: nieznana opcja \"-%s\", sprawdź użycie z opcją --help\n"
+
 #~ msgid "no webfetch (curl or wget currently) found\n"
 #~ msgstr "Nie znaleziono programu do pobierania stron (curl lub wget)\n"
diff --git a/po/pt.po b/po/pt.po
index 2f2c9d60..e7b3fecc 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2004-03-11 22:08+0100\n"
 "Last-Translator: Jose Jorge <jjorge@free.fr>\n"
 "Language-Team: português <pt@li.org>\n"
@@ -61,22 +61,22 @@ msgstr ""
 "Instalação automática de pacotes...\n"
 "Pediu a instalação do pacote %s\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "Está bem assim?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (S/n) "
@@ -86,7 +86,7 @@ msgstr " (S/n) "
 msgid "%s: command not found\n"
 msgstr "%s: comando não encontrado\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
@@ -95,114 +95,53 @@ msgstr ""
 "uso : %s [opções]\n"
 "onde [opções] estão em\n"
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - mostra esta mensagem de ajuda.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "   -g [group]     - mostra a marca do grupo: group.\n"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, c-format
 msgid "                    defaults is %s.\n"
 msgstr "                   por omissão é %s.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Descarregador desconhecido `%s' !!!\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "protocolo desconhecido definido para %s"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "nenhum webfetch encontrado, os webfetch suportados são : %s\n"
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "impossível utilizar o protocolo: %s"
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "a cópia falhou %s"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "falta o wget\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget falhou: saiu com %d ou o sinal %d\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "falta o curl\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl falhou: saiu com %d ou o sinal %d\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "falta o rsync\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "rsync falhou: saiu com %d ou o sinal %d\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "falta o ssh\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% de %s completados, FIM = %s, velocidade = %s"
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% completado, velocidade = %s"
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...o descarregamento falhou : %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "erro de sintaxe no ficheiro de configuração na linha %s"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr "o média \"%s\" tenta utilizar uma hdlist já usado, vai ser ignorado"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 "o média \"%s\" tenta usar um ficheiro lista já usado, vou ignorar o média"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -211,43 +150,43 @@ msgstr ""
 "impossível de tomar em conta o média \"%s\" pois o ficheiro lista já é usado "
 "por outro média"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 "impossível de utilizar o nome \"%s\" para o média sem nome porque já está "
 "usado"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 "impossível de tomar o média \"%s\" em conta porque nenhum ficheiro de lista "
 "[%s] existe"
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "impossível de determinar o média do ficheiro hdlist [%s]"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 "impossível de aceder ao ficheiro hdlist de \"%s\", o média vai ser ignorado"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 "impossível de aceder ao ficheiro lista de \"%s\", o média vai ser ignorado"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "a tentar ignorar o média \"%s\", a evitar"
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -256,96 +195,96 @@ msgstr ""
 "o média virtual \"%s\" não deve ter um hdlist ou uma lista de ficheiros "
 "definida, vou ignorar o média"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "o média virtual \"%s\" deve ter um url limpo, vai ser ignorado"
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 "impossível de encontrar o ficheiro hdlist para \"%s\", o média vai ser "
 "ignorado"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 "impossível de encontrar o ficheiro lista para \"%s\", o média é ignorado"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "o ficheiro lista para \"%s\" é incoerente, o média vai ser ignorado"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
 "incapaz de inspectar o ficheiro lista para \"%s\", o média vai ser ignorado"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "há demasiados pontos de montagem para o média amovível \"%s\""
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "a considerar o dispositivo amovível como \"%s\""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "a utilizar um dispositivo amovível diferente [%s] para \"%s\""
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "incapaz de tomar o caminho do média amovível \"%s\""
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "impossível de escrever o ficheiro de configuração [%s]"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "escreve o ficheiro de configuração [%s]"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "Não posso utilizar o modo paralelo com o modo use-distrib"
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "impossível de encontrar \"%s\" no ficheiro [%s]"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "a examinar a pegada paralela no ficheiro [%s]"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "encontrei uma pegada paralela para os nodes %s"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "a utilizar o média associado para o modo paralelo : %s"
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "impossível de a opção paralela \"%s\""
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -354,90 +293,90 @@ msgstr ""
 "--synthesis não pode ser utilizado com --media, --excludemedia, --sortmedia, "
 "-- update ou --parallel"
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "a examinar o ficheiro síntese [%s]"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "a examinar o ficheiro hdlist [%s]"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "o média virtual \"%s\" não é local, vai ser ignorado"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "problema ao ler o ficheiro hdlist ou síntese do média \"%s\""
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "a passar uma segunda vez para calcular as dependências\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "a saltar o pacote %s"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "instalaria no lugar do actualizar o pacote %s"
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "impossível abrir o rpmdb"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "o média \"%s\" já existe"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr "os médias virtuais devem ser locais"
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "adicionei o média %s"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "impossível de aceder ao primeiro média de instalação"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "a copiar o ficheiro hdlist..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "...a cópia errou"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "...copia feita"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
@@ -446,43 +385,49 @@ msgstr ""
 "impossível de aceder ao primeiro média de instalação (não achei os ficheiros "
 "Mandrake/base/hdlists)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "a descarregar o ficheiro hdlist..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "...descarregamento feito."
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...o descarregamento falhou : %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "descrição hdlist \"%s\" inválida no ficheiro hdlists"
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "a tentar seleccionar um média \"%s\" que não existe"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "a escolher vários médias : %s"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "a remover o média \"%s\""
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -492,7 +437,7 @@ msgstr ""
 "impossível de aceder ao média \"%s\",\n"
 "isto pode acontecer se montou manualmente a directoria quando criou o média."
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -501,222 +446,222 @@ msgstr ""
 "o média virtual \"%s\" deve ter uma fonte correcta hdlist ou síntese, vou "
 "ignorar o média"
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "a copiar o ficheiro de descrição de \"%s\"..."
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "a calcular o md5sum do hdlist (ou síntese) actual"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "a examinar o ficheiro MD5SUM"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "a copiar o hdlist (ou a síntese) de \"%s\"..."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "a cópia de [%s] falhou (o ficheiro é suspeitosamente pequeno)"
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "a calcular o md5sum do hdlist (ou síntese) copiado"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "a copia de [%s] falhou (diferença no md5sum)"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "problema ao ler o ficheiro de síntese do média \"%s\""
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "o ler os ficheiros rpm de [%s]"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "incapaz de ler o ficheiros rpm de [%s] : %s"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "nenhum ficheiro rpm encontrado em [%s]"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "a descarregar a fonte hdlist (ou síntese) de \"%s\"..."
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "encontrei a hdlist (ou a síntese) testada como %s"
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "a calcular o md5sum do hdlist (ou síntese) descarregado"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr "diferença no md5sum"
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "o descarregamento do hdlist (ou da síntese) falhou"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "não encontrei um ficheiro hdlist para o média \"%s\""
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "o ficheiro [%s] já está utilizado no mesmo média \"%s\""
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "impossível de percorrer o ficheiro hdlist de \"%s\" "
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "impossível de escrever o ficheiro lista de \"%s\""
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "a escrever o ficheiro de lista para o média \"%s\""
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "nada de escrito no ficheiro lista para \"%s\""
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "a examinar o ficheiro de chaves públicas de \"%s\"..."
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...importei a chave %s do ficheiro de chaves públicas de \"%s\""
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "não pude importar o ficheiro de chaves públicas de \"%s\""
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "a ler os cabeçalhos do média \"%s\""
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "a construir o hdlist [%s]"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "construí o ficheiro de síntese hdlist para o média \"%s\""
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "encontrei %d cabeçalhos no cache"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "a apagar %d cabeçalhos obsoletos no cache"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "a montar %s"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "a desmontar %s"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "mudei %s entradas na lista das dependências"
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "nenhuma entrada mudada na lista das dependências"
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "o nome de ficheiro rpm não é válido [%s]"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "a descarregar o ficheiro rpm [%s] ..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "impossível aceder ao ficheiro rpm [%s]"
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "impossível de registar o ficheiro rpm"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "erro ao registar os pacotes locais"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "nenhum pacote se chama %s"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Os seguintes pacotes têm %s: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "há vários pacotes com o mesmo nome de ficheiro rpm \"%s\""
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "incapaz de percorrer bem [%s] no valor \"%s\""
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -725,144 +670,159 @@ msgstr ""
 "o média \"%s\" utiliza uma lista de ficheiros inválida :\n"
 "  o servidor não está provavelmente actualizado, tente utilizar outro método"
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "o média \"%s\" não define nenhum sitio para ficheiros rpm"
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "o pacote %s não foi encontrado"
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "a base de dados urpmi está cerrada"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "o média \"%s\" não está selecionado"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "impossível de ler o ficheiro rpm [%s] do média \"%s\""
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "média incoerente \"%s\" marcado como amovível mas não o é de facto"
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "impossível de aceder ao média \"%s\""
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "entrada malformada : [%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "a descarregar os ficheiros rpm a partir do média \"%s\"..."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "A preparar..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "a utilizar o processo %d para fazer a transacção"
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 "criei a transacção para instalar em %s (apaga=%d, instala=%d, actualiza=%d)"
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr "impossível de criar a transacção"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "a remover o pacote %s"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "impossível remover o pacote %s"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "a adicionar o pacote %s (id=%d, eid=%d, actualiza=%d, ficheiro=%s)"
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "impossível instalar o pacote %s"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "devido a faltar %s"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "devido a não satisfazer %s"
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr "a tentar promover %s"
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr "para guardar %s"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "para instalar %s"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "devido a conflitos com %s"
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr "não pedido"
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Assinatura não válida (%s)"
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "ID chave não válida (%s)"
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Falta a assinatura (%s)"
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "má declaração do proxy na linha de commando\n"
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: é impossível ler o ficheiro rpm \"%s\"\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Desculpe, opção incorrecta, tente de novo\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -878,19 +838,19 @@ msgstr ""
 "\n"
 "utilização:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - mostra esta mensagem de ajuda.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 "  --auto         - escolhe automaticamente um pacote quando necessário.\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
@@ -898,24 +858,24 @@ msgstr ""
 "  --test         - verifica se a instalação pode ser efectuada "
 "correctamente.\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 "  --force        - força a execução mesmo se alguns pacotes não existem.\n"
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - urpmi distribuído através das máquinas do aliás.\n"
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - utiliza outra raíz para instalar os rpm.\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -924,75 +884,65 @@ msgstr ""
 "  --use-distrib  - configura o urpmi para outra fonte, útil\n"
 "         para (des)instalar um chroot com a opção --root.\n"
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - modo detalhado.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 "  -a             - escolhe todos os pacotes correspondentes à expressão.\n"
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: opção desconhecida \"-%s\", ver utilização com --help\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr "pacotes desconhecidos"
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "pacote desconhecido"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "remover o pacote %s vai arruinar o seu sistema"
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr "Nada a remover"
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "A verificar para remover os pacotes seguintes"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
 "Por forma a resolver as dependências, serão apagados os seguintes pacotes (%"
 "d MB)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (s/N) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "a remover %s"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr "Impossível apagar"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Desculpe, opção incorrecta, tente de novo\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1008,24 +958,24 @@ msgstr ""
 "\n"
 "utilização:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - utiliza só os média de actualização.\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 "  --media        - utiliza só os média indicados, separados por virgulas.\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 "  --excludemedia - não utiliza os média indicados, separados por virgulas.\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1033,17 +983,17 @@ msgstr ""
 "  --sortmedia    - organiza os média seguintes as cadeias separadas por "
 "virgulas.\n"
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr "  --synthesis    - usa a síntese indicada no lugar da bdd urpmi.\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  -verbose      - modo detalhado.\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1055,92 +1005,92 @@ msgstr ""
 "                   é dada na linha de comando, incompatível com o modo "
 "interactivo).\n"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --uniq         - não mostra as linhas iguais.\n"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all           - mostra todas as marcas.\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group        - mostra a marca do grupo: group.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size         - mostra a marca do tamanho: size.\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --epoch        - mostra a marca da época: epoch.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary      - mostra a marca do resumo: summary.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description  - mostra a marca da descrição: description.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr "  --sourcerpm    - mostra a marca sourcerpm: rpm fonte.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr "  --packager     - mostra a marca packager: autor do pacote.\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr "  --buildhost    - mostra a marca buildhost: máquina de compilação.\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --url          - mostra a marca do url : url.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr ""
 "  --provides     - mostra a marca dos fornecidos: todos os fornecidos.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr ""
 "  --requires     - mostra a marca dos requeridos : todos os requeridos.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr ""
 "  --files        - mostra a marca dos ficheiros : todos os ficheiros.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr ""
 "  --conflicts    - mostra a marca dos conflitos : todos os conflitos.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr ""
 "  --obsoletes     - mostra a marca dos obsoletos : todos os obsoletos.\n"
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
@@ -1149,23 +1099,23 @@ msgstr ""
 "  --env          - utiliza um contexto particular (tipicamente um\n"
 "                   relatório de bug).\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr "  -i            - ignora a diferenças de capitalização.\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - mostra a versão, o numero e a arquitectura com o nome.\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e            - inclui o código perl directamente como perl -e.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
@@ -1173,7 +1123,7 @@ msgstr ""
 "  -a             - operador binário E, verdadeiro se as duas expressões são "
 "verdadeiras.\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
@@ -1181,25 +1131,25 @@ msgstr ""
 "  -o             - operador binário OU, verdadeiro se uma expressão é "
 "verdadeira.\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 "  !              - operador unário NÃO, verdadeiro se a expressão é falsa.\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
 "  (              - parêntesis esquerdo para abrir um grupo de expressões.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
 "  )              - parêntesis direito para fechar um grupo de expressões.\n"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
@@ -1208,12 +1158,12 @@ msgstr ""
 "a chamada de retorno é :\n"
 "%s\n"
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "utilizando o ambiente especificado em %s\n"
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1229,12 +1179,12 @@ msgstr ""
 "\n"
 "utilização:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - usa a síntese indicada no lugar da bdd urpmi.\n"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
@@ -1242,7 +1192,7 @@ msgstr ""
 "  --auto-select  - selecciona automaticamente os pacotes para actualizar o "
 "sistema.\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
@@ -1250,7 +1200,7 @@ msgid ""
 msgstr ""
 "  --no-uninstall - nunca propõe de apagar um pacote, pára a instalação.\n"
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1259,7 +1209,7 @@ msgstr ""
 "  --keep         - guarda os pacotes instalados se possível, recusa os\n"
 "                   pacotes pedidos que impedem isso.\n"
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1270,38 +1220,38 @@ msgstr ""
 "                   ou actualizados mais pacotes do que os indicados,\n"
 "                   por omissão é %d.\n"
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - tamanho das transacções pequenas, por omissão %d.\n"
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - impõe uma procura aproximada (o mesmo que -y).\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 "  --src          - o próximo pacote e um pacote fonte (o mesmo que -s).\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - instala só os pacotes fonte (nenhum binário).\n"
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - remove da cache os rpm antes de começar.\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - mantém na cache os rpm não usados.\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1310,7 +1260,7 @@ msgstr ""
 "  --allow-nodeps - pergunta ao utilizador se deseja instalar\n"
 "                   os pacotes sem verificar as dependências.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1319,7 +1269,7 @@ msgstr ""
 "  --allow-force  - pergunta ao utilizador se deseja instalar\n"
 "                   os pacotes sem verificar as dependências e integridade.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1328,24 +1278,24 @@ msgstr ""
 "  --use-distrib  - configura o urpmi para outra fonte, útil\n"
 "         para (des)instalar um chroot com a opção --root.\n"
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 "  --wget         - utiliza wget para descarregar os ficheiros distantes.\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 "  --curl         - utiliza o curl para descarregar os ficheiros distantes.\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - limita a velocidade de descarga.\n"
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1355,7 +1305,7 @@ msgstr ""
 "parte\n"
 "                   (--no-verify-rpm desactiva isto, activo por omissão).\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1364,7 +1314,7 @@ msgstr ""
 "  --proxy        - utiliza o proxy HTTP indicado, o numero de porta é\n"
 "               1080 por omissão (o formato é <servidorproxy[:porta]>).\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1373,7 +1323,7 @@ msgstr ""
 "  --proxy-user   - indica o nome e a senha a utilizar para a\n"
 "       autenticação no proxy (o formato é <nome:senha>).\n"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1382,12 +1332,12 @@ msgstr ""
 "  --bug          - escreve um resumo de erro na pasta indicada\n"
 "                   no parametro seguinte.\n"
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - utiliza o interface X.\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1396,7 +1346,7 @@ msgstr ""
 "  --best-output  - escolhe o melhor interface de acordo com a\n"
 "                   sessão: X ou modo de texto.\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1405,82 +1355,71 @@ msgstr ""
 "  --verify-rpm   - verifica a assinatura do rpm antes de instalar.\n"
 "                   (--no-verify-rpm desactiva isto, activo por omissão).\n"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - exclui os caminhos separados por virgulas.\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - exclui os ficheiros de documentação.\n"
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 "  -a             - escolhe todas as correspondências da linha de comando.\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 "  -p             - permite a procura em fornecidos para encontrar o pacote.\n"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 "  -P             - não procura nos fornecidospara encontrar o pacotes.\n"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 "  -y             - impõe uma procura aproximada (o mesmo que --fuzzy).\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 "  -s             - o próximo pacote é um pacote fonte (o mesmo que --src).\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - modo silencioso.\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 "  os nomes ou ficheiros rpm indicados na linha de comando vão ser "
 "instalados.\n"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr "Escolha onde gravar o ficheiro"
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "má declaração do proxy na linha de commando\n"
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: opção desconhecida \"-%s\", ver utilização com --help\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 "O que pode ser feito com pacotes de rpm binários quando se utiliza --install-"
 "src"
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1501,22 +1440,22 @@ msgstr ""
 "\n"
 "Que deseja fazer ?"
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "Não fazer nada"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr "Sim, instalar-lo mesmo"
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr "Gravar ficheiro"
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1531,54 +1470,54 @@ msgstr ""
 "\n"
 "Pode preferir só o gravar. Que escolhe ?"
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, c-format
 msgid "Install it"
 msgstr "Instalar-lo"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr "A pasta [%s] já existe, utilize por favor outra pasta ou apague-at"
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Impossível criar a pasta [%s] para relatar o erro"
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Apenas o superutilizador pode instalar pacotes"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "Um dos seguintes pacotes é necessário para a instalação %s:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Um dos seguintes pacotes é necessário:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Qual é a sua escolha? (1-%d)"
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "Instalação dos pacotes..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "A iniciar..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1587,12 +1526,12 @@ msgstr ""
 "Alguns pacotes pedidos não podem ser instalados :\n"
 "%s"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr "aceita ?"
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1603,7 +1542,7 @@ msgstr ""
 "de ser removidos para que outros sejam actualizados:\n"
 "%s\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1613,16 +1552,16 @@ msgstr ""
 "actualizados:\n"
 "%s"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
 "Por forma a resolver as dependências, serão instalados os seguintes pacotes "
 "(%d MB)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1631,37 +1570,47 @@ msgstr ""
 "Necessita ser root para instalar as dependências seguintes : \n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "impossível obter pacotes fonte, a interromper"
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Por favor insira o media com o nome \"%s\" no dispositivo [%s]"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Prima 'Entrada' quando pronto..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "A descarregar o pacote %s"
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% de %s completados, FIM = %s, velocidade = %s"
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% completado, velocidade = %s"
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Os seguintes pacotes têm assinaturas erradas"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Deseja continuar a instalação?"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1672,57 +1621,57 @@ msgstr ""
 "%s\n"
 "Talvez queira actualizar a sua base de dados urpmi."
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "A instalação falhou"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr "a distribuir %s"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr "a instalar %s"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "A instalar o pacote `%s' (%s/%s)..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Tentar a instalação sem verificar dependências? (s/N) "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Tentar a instalação de forma mais insistente (--force)? (s/N) "
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d transacções de instalação falharam"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "A instalação é possível"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "já está tudo instalado"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr "reinicio do urpmi"
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1747,23 +1696,23 @@ msgstr ""
 "\n"
 "e as [opções] possíveis são\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - cria um média de actualização.\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
 "  --probe-synthesis - tenta encontrar e utilizar um ficheiro de síntese.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr "  --probe-hdlist - tenta encontrar e utilizar um ficheiro hdlist.\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
@@ -1772,7 +1721,7 @@ msgstr ""
 "  --no-probe     - não tenta encontrar um ficheiro de\n"
 "                   síntese ou hdlist.\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -1781,7 +1730,7 @@ msgstr ""
 "  --distrib      - cria automaticamente todos os médias a partir de\n"
 "                   um média de instalação.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1792,7 +1741,7 @@ msgstr ""
 "                   XXX pode ser main, contrib, updates ou qualquer outro\n"
 "                   que tenha sido configurado ;-)\n"
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1801,7 +1750,7 @@ msgstr ""
 "  --from         - utiliza a url indicada para a lista dos espelhos, por\n"
 "                   omissão é %s\n"
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1811,7 +1760,7 @@ msgstr ""
 "  --version      - utiliza a versão indicada, por omissão a versão do\n"
 "                   pacote mandrake-release instalado.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
@@ -1820,7 +1769,7 @@ msgstr ""
 "  --arch         - utiliza a arquitectura indicada, por omissão a arch\n"
 "                   do pacote mandrake-release instalado.\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
@@ -1829,73 +1778,52 @@ msgstr ""
 "  --virtual      - cria um média virtual que está ser actualizado,\n"
 "                   só é permitido o protocolo file://\n"
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - não testa o MD5SUM dos ficheiros.\n"
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - limpa a pasta cache dos cabeçalhos.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - força a criação dos ficheiros hdlist.\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"opções desconhecidas '%s'\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "Não é possível adicionar actualizações duma distribuição cooker\n"
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "a descarregar os servidores espelhos em %s ..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"não é preciso indicar o <caminho relativo para hdlist> com --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "não é preciso indicar o <caminho relativo para hdlist> com --distrib"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "impossível actualizar o média \"%s\"\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"<caminho relativo de hdlist> em falta\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<caminho relativo de hdlist> em falta\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"falta `with' para um média rede\n"
+msgid "`with' missing for network media\n"
+msgstr "falta `with' para um média rede\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "impossível criar o média \"%s\"\n"
@@ -1914,6 +1842,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - selecciona todos os médias.\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"opções desconhecidas '%s'\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1928,7 +1865,7 @@ msgstr ""
 "a entrada a remover está em falta\n"
 "(um de %s)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1937,27 +1874,27 @@ msgstr ""
 "utilização: urpmi.update [opções] <nome> ...\n"
 "onde <nome> é o nome do média a actualizar.\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - utiliza só os médias de actualização.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr "  --force-key    - força a actualização da chave gpg.\n"
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - selecciona todos os médias não amovíveis.\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "nada a actualizar (use urpmi.addmedia para adicionar um media)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1966,7 +1903,7 @@ msgstr ""
 "a entrada a actualizar está em falta\n"
 "(um de %s)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1982,22 +1919,22 @@ msgstr ""
 "\n"
 "utilização:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - lista os pacotes disponíveis.\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - lista os média disponíveis.\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - lista os média disponíveis com os seus endereços.\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
@@ -2005,17 +1942,17 @@ msgstr ""
 "  --dump-config  - mostra a configuração na forma de parâmetros para urpmi."
 "addmedia.\n"
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr "  --list-nodes   - lista os nós disponíveis quando usa --parallel.\n"
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases   - lista os aliases paralelos disponíveis.\n"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
@@ -2024,7 +1961,7 @@ msgstr ""
 "  --headers      - extrai os cabeçalhos dos pacotes listados a partir da\n"
 "                   base de dados urpmi para stdout (só root).\n"
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
@@ -2032,7 +1969,7 @@ msgstr ""
 "  --sources      - indica todos os pacotes a instalar antes de os "
 "descarregar (se root).\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
@@ -2041,17 +1978,17 @@ msgstr ""
 "  --use-distrib  - configura o urpmi para outra fonte.\n"
 "                 isto permite de interrogar uma fonte.\n"
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - mostra as mudanças.\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - alarga a procura às dependências dos pacotes.\n"
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -2060,54 +1997,108 @@ msgstr ""
 "  -u             - remove o pacote se uma versão mais recente já está "
 "instalada.\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - listagem completa dos pacotes a remover.\n"
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - reverte a procura para o que requer o pacote.\n"
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -i             - mostra informações úteis de maneira legível.\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - indica o grupo com o nome.\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - mostra a versão e o número com o nome.\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - lista os ficheiros no pacote.\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 "  os nomes ou os ficheiros rpm indicados na linha de comando são "
 "interrogados.\n"
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: opção desconhecida \"-%s\", ver uso com --help\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: é impossível ler o ficheiro rpm \"%s\"\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes só pode ser utilizado com --parallel"
+
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "Descarregador desconhecido `%s' !!!\n"
+
+#~ msgid "copy failed: %s"
+#~ msgstr "a cópia falhou %s"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "falta o wget\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "wget falhou: saiu com %d ou o sinal %d\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "falta o curl\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "curl falhou: saiu com %d ou o sinal %d\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "falta o rsync\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "rsync falhou: saiu com %d ou o sinal %d\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "falta o ssh\n"
+
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpme: opção desconhecida \"-%s\", ver utilização com --help\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmi: opção desconhecida \"-%s\", ver utilização com --help\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr ""
+#~ "Por forma a resolver as dependências, serão instalados os seguintes "
+#~ "pacotes (%d MB)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "não é preciso indicar o <caminho relativo para hdlist> com --distrib"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "<caminho relativo de hdlist> em falta\n"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "falta `with' para um média rede\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmq: opção desconhecida \"-%s\", ver uso com --help\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 55871507..8cd37fad 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-pt_BR\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2004-02-06 00:55+0200\n"
 "Last-Translator: Carlinhos Cecconi <carlinu@terra.com.br>\n"
 "Language-Team: Português Brasileiro <linux_pt_BR@yahoogrupos.com.br>\n"
@@ -57,22 +57,22 @@ msgstr ""
 "Instalação automática de pacotes...\n"
 "Você pediu a instalação do pacote %s\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "Tudo bem?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (S/n) "
@@ -82,120 +82,59 @@ msgstr " (S/n) "
 msgid "%s: command not found\n"
 msgstr "%s: comando não encontrado\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "where [options] are from\n"
 msgstr ""
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - imprime esta mensagem de ajuda.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, fuzzy, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "  --group        - imprime a tag 'group': group. \n"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, fuzzy, c-format
 msgid "                    defaults is %s.\n"
 msgstr "  -l             - lista os arquivos do pacote.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Software de aquisição desconhecido`%s' !!!\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "protocolo desconhecido definido para %s"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "nenhuma webfetch encontrada, webfetch suportadas são: %s\n"
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "Incapaz de usar protocolo: %s"
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "falha na cópia: %s"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "Está faltando o software 'wget'\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget falhou: saiu com %d ou sinal %d\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "Está faltando o software 'curl'\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl falhou: saiu com %d ou sinal %d\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "Está faltando o software 'rsync'\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "rsync falhou: saiu com %d ou sinal %d\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "Está faltando o software 'ssh'\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "      %s%% de %s completo, ETA = %s, velocidade = %s"
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "      %s%% completo, velocidade = %s"
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "   A aquisição falhou: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "Erro de sintaxe no arquivo de configuração na linha %s"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr "Mídia \"%s\" tentou usar um 'hdlist' já usada, mídia ignorada."
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr "mídia \"%s\" tentou usar uma lista já usada, mídia ignorada."
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -204,39 +143,39 @@ msgstr ""
 "Incapaz de lidar com a mídia \"%s\" porque o arquivo está sendo usado por "
 "outra mídia"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 "incapaz de usar o nome \"%s\" para mídia não-nomeada, porque já está em uso."
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 "incapaz de usar a mídia \"%s\" porque nenhum arquivo da lista [%s] existe."
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "incapaz de determinar a mídia deste arquivo 'hdlist' [%s]"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "incapaz de acessar a arquivo 'hdlist' de \"%s\", mídia ignorada"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "incapaz de acessar a lista de arquivos de \"%s\", mídia ignorada."
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "Tentando contornar mídia existente \"%s\", evitando"
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -245,92 +184,92 @@ msgstr ""
 "Mídia Virtual \"%s\" não contém o arquivo 'hdlist' ou lista de arquivos; "
 "mídia ignorada."
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "mídia virtual \"%s\" precisa ter uma url limpa, mídia ignorada."
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "Incapaz de encontrar arquivo 'hdlist' para \"%s\", mídia ignorada."
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "incapaz de encontrar a lista para \"%s\", mídia ignorada."
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "Lista de arquivos incoerente para \"%s\", mídia ignorada"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "incapaz de inspecionar a lista de arquivos \"%s\", mídia ignorada"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "muitos pontos de montagem para a mídia removível \"%s\""
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "Pegando dispositivos removíveis como \"%s\""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "Usando diferentes dispositivos removíveis [%s] para \"%s\""
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "incapaz de adquirir caminhos para mídia removível \"%s\""
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "incapaz de gravar o arquivo de configuração [%s]"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "grava o arquivo de configuração [%s]"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "Não pode usar o modo paralelo com modo 'use-distrib'"
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "incapaz de processar \"%s\" no arquivo [%s]"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "examinando aquisição em paralelo no arquivo [%s]"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "Encontrada aquisição em paralelo com os nós: %s"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "usando a mídia associada para o modo paralelo: %s"
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "incapaz de usar a opção paralela \"%s\""
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -339,90 +278,90 @@ msgstr ""
 "--synthesis não pode ser usada com --media, -excludemedia, -sortmedia, --"
 "update ou --parallel"
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "Examinando arquivo de síntese [%s]"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "Examinando arquivo 'hdlist' [%s]"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "mídia virtual \"%s\" não é local, mídia ignorada"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "Problema lendo arquivo hdlist ou síntese da mídia \"%s\""
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "fazendo segundo passo para calcular dependências\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "pulando o pacote %s"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "é necessário instalar ao invés de atualizar o pacote %s"
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "incapaz de abrir rpmdb"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "Mídia \"%s\" já existe"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr "mídia virtual precisa ser local"
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "Mídia adicionada %s"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "incapaz de acessar a primeira mídia de instalação."
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "Copiando arquivo 'hdlist'..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "...falha na cópia"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "..cópia terminada"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
@@ -431,43 +370,49 @@ msgstr ""
 "incapaz de acessar a primeira mídia de instalação (não encontrado o arquivo "
 "Mandrake/base/hdlists)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "Adquirindo arquivo 'hdlist'..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "..aquisição completa"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "   A aquisição falhou: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "descrição inválida \"%s\" no arquivo 'hdlists'"
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "tentando selecionar mídia inexistente \"%s\""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "selecionando múltiplas mídias: %s"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "removendo a mídia \"%s\""
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -478,7 +423,7 @@ msgstr ""
 "verifique se não é necessário montar manualmente o diretório no qual ela foi "
 "criada."
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -487,222 +432,222 @@ msgstr ""
 "Mídia \"%s\" a fonte fornecida não é válida ('hdlist' ou 'synthesis'), mídia "
 "ignorada."
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "Copiando o arquivo de descrição de \"%s\"..."
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "computando o md5sum de uma fonte 'hdlist' existente (ou síntese)"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "Examinando arquivo MD5SUM"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "copiando fonte 'hdlist' (ou síntese) de \"%s\"..."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "cópia de [%s] falhou (arquivo é suspeitamente pequeno)"
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "computando o md5sum de uma fonte 'hdlist' copiada (ou síntese)"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "cópia de [%s] falhou (md5sum não é igual)"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "Problema ao ler arquivo síntese da mídia \"%s\""
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "lendo arquivos rpms de [%s]"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "incapaz de ler os arquivos rpm de: [%s]: %s"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "nenhum arquivo rpm encontrado em [%s]"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "Adquirindo a fonte 'hdlist' (ou a síntese) de \"%s\"..."
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "encontrado 'hdlist' (ou síntese) em %s"
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "computando o md5sum de uma fonte 'hdlist' recuperada (ou síntese)"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr "assinatura md5sum diferente"
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "Aquisição da fonte hdlist (ou síntese) falhou"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "Nenhum arquivo 'hdlist' encontrado para a mídia \"%s\""
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "arquivo [%s] já está em uso na mesma mídia \"%s\""
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "incapaz de atualizar o arquivo hdlist de \"%s\""
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "incapaz de gravar lista de arquivos de \"%s\""
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "Gravando a lista de arquivos para a mídia \"%s\""
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "Nada escrito na lista para \"%s\""
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "examinando arquivo de chave pública em \"%s\"..."
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...importando chave %s do arquivo de chaves públicas de \"%s\""
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "incapaz de importar arquivo de chave pública de \"%s\""
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "Lendo cabeçalhos da mídia \"%s\""
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "Construindo 'hdlist' [%s]"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "Construindo arquivo de síntese de 'hdlist' para mídia \"%s\""
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "Encontrado %d cabeçalhos no cache."
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "Removendo %d cabeçalhos obsoletos no cache."
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "Montando %s"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "Desmontando %s"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "entradas %s realocadas na depslist"
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "Nenhuma entrada realocada em depslist"
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "Nome rpm inválido [%s]"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "Adquirindo o arquivo rpm [%s]...."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "incapaz de acessar o arquivo rpm [%s]"
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "incapaz de registrar arquivo rpm"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "Erro ao registrar pacotes locais"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "Nenhum nome de pacote %s"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Os seguintes pacotes contém %s: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "Existem múltiplos pacotes com o mesmo nome rpm \"%s\""
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "incapaz de ler corretamente [%s] no valor \"%s\""
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -712,144 +657,159 @@ msgstr ""
 "  o espelho provavelmente não está atualizado, tente usando métodos "
 "alternativos"
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "a mídia \"%s\" não define uma localização para arquivos rpm"
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "o pacote %s não foi encontrado."
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "Base de dados urpmi travada."
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "Mídia \"%s\" não está selecionada"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "incapaz de ler o arquivo rpm [%s] para a mídia \"%s\""
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "Mídia incoerente \"%s\" marcada como removível, porém não é."
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "incapaz de acessar a mídia \"%s\""
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "Entrada mal construída: [%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "Adquirindo os arquivos rpm da mídia \"%s\"..."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "Preparando..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "utilizando processo %d para executar a transação"
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 "transação criada para instalar %s (remover=%d, instalar=%d, atualizar=%d)"
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr "incapaz de criar a transação"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "removendo pacote %s"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "incapaz de remover o pacote %s"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "adicionando pacote %s (id=%d, eid=%d, atualização=%d, arquivo=%s)"
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "incapaz de instalar o pacote %s"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "devido estar faltando %s"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "devido a não satisfazer %s"
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr "tentando promover %s"
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr "para continuar %s"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "para instalar %s"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "devido a conflitos com %s"
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr "não requisitado"
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Assinatura inválida (%s)"
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "Chave Inválida ID (%s)"
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Assinatura não encontrada (%s)"
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "declaração de proxy errada na linha de comando\n"
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: não pode ler o arquivo rpm \"%s\"\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Desculpe, má escolha, tente novamente\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -866,41 +826,41 @@ msgstr ""
 "\n"
 "uso:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - imprime esta mensagem de ajuda.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - automaticamente seleciona um pacote, em escolhas.\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 "  --test         - verifica se a instalação pode ser efetuada corretamente.\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - força mesmo se alguns pacotes não existem.\n"
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - urpmi distribuído.\n"
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - use outro root para instalação rpm.\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -910,74 +870,64 @@ msgstr ""
 "                   padrão, útil para (des)instalar a chroot com a\n"
 "                   opção --root.\n"
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - modo de detalhe.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 "  -a             - seleciona todos os pacotes que combinam com a expressão.\n"
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: opção desconhecida \"-%s\", cheque o uso com a opção --help\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr "pacotes desconhecidos"
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "pacote desconhecido."
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "a remoção do pacote %s irá danificar seu sistema"
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr "Nada para remover"
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "Verificando para remover os seguintes pacotes"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
 "Para satisfazer as dependências, os seguintes pacotes serão removidos (%d MB)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (s/N) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "removendo %s"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr "A remoção falhou"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Desculpe, má escolha, tente novamente\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -994,41 +944,41 @@ msgstr ""
 "\n"
 "uso:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - use somente mídia update (de atualização).\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 "  --media        - use somente as mídias listadas (separadas por vírgulas).\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 "  --excludemedia - não usa a mídia fornecida (separadas por vírgulas).\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr "  --sortmedia    - ordena as mídias (separadas por vírgulas).\n"
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - usa a síntese dada ao invés do banco de dados urpmi.\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - modo de detalhe.\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1039,92 +989,92 @@ msgstr ""
 "                   dada na linha de comando. Incompatível com modo\n"
 "                   interativo).\n"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --uniq         - não lista linhas idênticas.\n"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all          - imprime todas as tags\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group        - imprime a tag 'group': group. \n"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size         - imprime a tag 'size': tamanho.\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --epoch        - imprime a tag da 'epoch': época.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary      - imprime a tag 'summary': sumário do pacote.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description  - imprime a tag 'description': descrição.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr "  --sourcerpm    - lista a tag 'sourcerpm': fonte do rpm.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr "  --packager     - lista a tag 'packager': empacotador. \n"
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr ""
 "  --buildhost    - lista a tag 'buildhost': máquina onde foi construído.\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --url          - imprime a tag 'url': url.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr ""
 "  --provides     - imprime a tag 'provides': lista todos os que provê.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr ""
 "  --requires     - imprime a tag 'requires': lista todos os que requer\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files        - imprime a tag 'files': lista todos os arquivos.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr ""
 "  --conflicts    - imprime a tag 'conflicts': lista todos os conflitantes.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr ""
 "  --obsoletes    - imprime a tag 'obsoletes': lista todos os obsoletos.\n"
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
@@ -1133,25 +1083,25 @@ msgstr ""
 "  --env          - usa um ambiente específico (tipicamente para relatório\n"
 "                   de falhas).\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
 "  -i             - ignora a distinção de maiúscula/minúscula em tudo.\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - imprime versão, 'release' e arquitetura, com nome.\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 "  -e             - inclui o código perl diretamente como em 'perl -e'.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
@@ -1159,7 +1109,7 @@ msgstr ""
 "  -a             - operador binário 'E', verdadeiro se ambas expressões\n"
 "                   forem verdadeiras.\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
@@ -1167,26 +1117,26 @@ msgstr ""
 "  -o             - operador binário 'OU', verdadeiro se uma expressão for\n"
 "                   verdadeira.\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 "  !              - operador unário 'NÃO', verdadeiro se a expressão é "
 "falsa.\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
 "  (              - parênteses esquerdo para abrir grupo de expressão.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
 "  )              - parênteses direito para fechar um grupo de expressão.\n"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
@@ -1195,12 +1145,12 @@ msgstr ""
 "a chamada de volta é:\n"
 "%s\n"
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "usando o ambiente específico em %s\n"
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1217,13 +1167,13 @@ msgstr ""
 "\n"
 "uso:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - usa a síntese dada ao invés do banco de dados urpmi.\n"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
@@ -1231,7 +1181,7 @@ msgstr ""
 "  --auto-select  - automaticamente seleciona os pacotes necessários para \n"
 "                   atualizar o sistema.\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
@@ -1240,7 +1190,7 @@ msgstr ""
 "  --no-uninstall - nunca pergunte para desistalar um pacote. Caso seja \n"
 "                   necessário, a instalação será abortada.\n"
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1249,7 +1199,7 @@ msgstr ""
 "  --keep         - mantém os pacotes existentes se possível, recusando os\n"
 "                   pacotes solicitados que pedem a remoção do pacote.\n"
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1260,39 +1210,39 @@ msgstr ""
 "                   precisa ser instalado ou atualizado,\n"
 "                   o padrão é %d.\n"
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - transações em pequenos pedaços, o padrão é %d.\n"
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - impõe uma busca aproximada (igual a -y).\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 "  --src          - o próximo pacote é um pacote fonte (o mesmo que -s).\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 "  --install-src  - instala somente o pacote de fontes (sem binários).\n"
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - remove os rpm do cache antes de iniciar.\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - mantém o rpm não usado no cache.\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1301,7 +1251,7 @@ msgstr ""
 "  --allow-nodeps - permite ao usuário instalar pacotes sem \n"
 "                   checagem de dependências.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1310,7 +1260,7 @@ msgstr ""
 "  --allow-force  - permite ao usuário instalar pacotes sem conferir\n"
 "                   dependências e integridade.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1320,22 +1270,22 @@ msgstr ""
 "                   padrão, útil para instalar um chroot com a\n"
 "                   opção --root.\n"
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - usa wget para adquirir arquivos distantes.\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - usa curl para adquirir arquivos distantes.\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - limita a velocidade do download.\n"
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1345,7 +1295,7 @@ msgstr ""
 "                   baixados (--no-resume desabilita isso, o padrão é\n"
 "                   desabilitado).\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1354,7 +1304,7 @@ msgstr ""
 "  --proxy        - usa o proxy HTTP especificado, o número da porta\n"
 "                   é 1080 por padrão (o formato é <máquinaproxy[:porta]>).\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1363,7 +1313,7 @@ msgstr ""
 "  --proxy-user   - especifica usuário e senha para usar na autenticação\n"
 "                   do proxy (o formato é <usuário:senha>).\n"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1372,12 +1322,12 @@ msgstr ""
 "  --bug          - escreve um relatório de falhas no diretório indicado\n"
 "                   pelo próximo argumento.\n"
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - usa  a interface X.\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1386,7 +1336,7 @@ msgstr ""
 "  --best-output  - escolhe a melhor interface de acordo com o ambiente:\n"
 "                   X ou modo texto.\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1395,76 +1345,65 @@ msgstr ""
 "  --verify-rpm   - verifica a assinatura do rpm antes da instalação.\n"
 "                   (--no-verify-rpm desabilita; por padrão é habilitado).\n"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - exclui o(s) caminho(s), separados por vírgula.\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - exclui arquivos de documentação.\n"
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - seleciona todos os listados na linha de comando.\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 "  -p             - permite a busca em 'provides' para achar o pacote.\n"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 "  -P             - não procure em 'provides' para encontrar o pacote.\n"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - impõe uma busca aproximada (igual a --fuzzy).\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 "  -s             - o próximo pacote é um pacote fonte (o mesmo que --src).\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - modo silencioso (não informativo).\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  nomes ou arquivos rpm dados na linha de comando serão instalados.\n"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr "Escolha o local para salvar o arquivo"
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "declaração de proxy errada na linha de comando\n"
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: opção desconhecida \"-%s\", confira o uso com opção --help\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr "O que pode ser feito com arquivos rpm binários ao usar --install-src"
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1485,22 +1424,22 @@ msgstr ""
 "\n"
 "O que você deseja fazer?"
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "Não faça nada"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr "Sim, instalar realmente"
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr "Salvar arquivo"
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1515,12 +1454,12 @@ msgstr ""
 "\n"
 "Você pode salvá-lo apenas.  Que é sua escolha?"
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, c-format
 msgid "Install it"
 msgstr "Instalar"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1529,42 +1468,42 @@ msgstr ""
 "Diretório [%s] já existe, favor usar outro diretório para reportar o "
 "problema ou apague-o"
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Incapaz de criar o diretório [%s] para relatório de falhas"
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Apenas o super-usuário tem permissão para instalar pacotes"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "Um dos seguintes pacotes é necessário para instalação %s:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Um dos pacotes a seguir é necessário:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Qual é a sua escolha? (1-%d) "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "Instalação de pacotes..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "Iniciando..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1573,12 +1512,12 @@ msgstr ""
 "Alguns pacotes não puderam ser instalados:\n"
 "%s"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr "Você aceita?"
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1589,7 +1528,7 @@ msgstr ""
 "precisam ser removidos para que os outros possam ser atualizados:\n"
 "%s\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1598,16 +1537,16 @@ msgstr ""
 "Estes pacotes precisam ser removidos para que os outros sejam atualizados:\n"
 "%s"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
 "Para satisfazer as dependências, os seguintes pacotes serão instalados (%d "
 "MB)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1616,37 +1555,47 @@ msgstr ""
 "Você precisa ser root para instalar as seguintes dependências :\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "incapaz de obter pacotes fonte, abortando"
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Insira a mídia chamada \"%s\" no dispositivo [%s]"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Aperte enter quando estiver pronto..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Baixando o pacote `%s'..."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "      %s%% de %s completo, ETA = %s, velocidade = %s"
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "      %s%% completo, velocidade = %s"
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Os seguintes pacotes contém assinaturas erradas"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Você deseja continuar com a instalação?"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1657,57 +1606,57 @@ msgstr ""
 "%s\n"
 "Você deve atualizar a sua base de dados urpmi"
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "A Instalação falhou"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr "distribuindo %s"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr "instalando %s"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instalando pacote `%s' (%s/%s)..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Tentar instalar sem checar as dependências? (s/N) "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Tentar instalar com mais força (--force)? (s/N) "
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d instalação falhou"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "Instalação é possível"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "tudo já está instalado"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr "reiniciando urpmi"
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1732,22 +1681,22 @@ msgstr ""
 "\n"
 "e [opções] são\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - cria uma mídia de atualização.\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr "  --probe-synthesis - tente encontrar e use o arquivo síntese.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr "  --probe-hdlist - tenta procurar e usar arquivo 'hdlist' \n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
@@ -1756,7 +1705,7 @@ msgstr ""
 "  --no-probe     - não tentar procurar qualquer arquivo de síntese\n"
 "                   ou arquivo 'hdlist'.\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -1766,7 +1715,7 @@ msgstr ""
 "mídia\n"
 "                   de instalação.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1778,7 +1727,7 @@ msgstr ""
 "                   atualizações ou qualquer outra que\n"
 "                   tenha sido configurada\n"
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1787,7 +1736,7 @@ msgstr ""
 "  --from         - usa um endereço url específico como lista de espelhos,\n"
 "                   o padrão é %s\n"
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1797,7 +1746,7 @@ msgstr ""
 "  --version      - usa a versão especificada, o padrão é a versão do\n"
 "                   pacote 'mandrake-release' instalado.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
@@ -1806,7 +1755,7 @@ msgstr ""
 "  --arch         - usa a arquitetura especificada, o padrão é a arquitetura\n"
 "                   especificada no pacote 'mandrake-release' instalado.\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
@@ -1815,73 +1764,52 @@ msgstr ""
 "  --virtual      - cria uma mídia virtual que será sempre atualizada,\n"
 "                   apenas o protocolo 'file://' é permitido.\n"
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - desabilita checagem de arquivo com MD5SUM.\n"
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - limpa o diretório dos cabeçalhos de cache.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - força a geração de arquivos 'hdlist'.\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"Opcões desconhecidas '%s'\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "não foi possível adicionar atualizações de uma distribuição 'cooker'\n"
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "pegando os espelhos em %s...."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"não precisa dar <caminho relativo do hdlist> com --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "não precisa dar <caminho relativo do hdlist> com --distrib"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "incapaz de atualizar mídia \"%s\"\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"<caminho relativo do hdlist> faltando\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<caminho relativo do hdlist> faltando\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"`with' faltando para mídia da rede\n"
+msgid "`with' missing for network media\n"
+msgstr "`with' faltando para mídia da rede\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "incapaz de criar mídia \"%s\"\n"
@@ -1900,6 +1828,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - seleciona todas as mídias.\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"Opcões desconhecidas '%s'\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1914,7 +1851,7 @@ msgstr ""
 "a entrada para remover está faltando\n"
 "(um de %s)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1923,27 +1860,27 @@ msgstr ""
 "uso: urpmi.update [opções] <nome> ...\n"
 "onde <nome> é um nome de mídia para atualizar.\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - atualize somente a mídia de atualizações.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr "  --force-key    - força atualização da chave gpg.\n"
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - seleciona todas as mídias não removíveis.\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "nada para atualizar (use urpmi.addmedia para adicionar uma mídia)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1952,7 +1889,7 @@ msgstr ""
 "a entrada a ser atualizada está faltando\n"
 "(uma de %s)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1969,22 +1906,22 @@ msgstr ""
 "\n"
 "uso:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - lista os pacotes disponíveis.\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - lista as mídias disponíveis\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - lista mídias disponíveis e suas url's.\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
@@ -1992,18 +1929,18 @@ msgstr ""
 "  --dump-config  - descarregar (dump) a configuração na forma do argumento "
 "urpmi.addmedia.\n"
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 "  --list-nodes   - lista os nós disponíveis quando  --parallel é usada.\n"
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - lista os apelidos paralelos disponíveis\n"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
@@ -2012,7 +1949,7 @@ msgstr ""
 "  --headers      - extrai cabeçalhos de pacotes listados, da base de\n"
 "                   dados urpmi para saída padrão (somente root).\n"
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
@@ -2020,7 +1957,7 @@ msgstr ""
 "  --sources      - fornece todos os pacotes fonte antes de baixar\n"
 "                   (somente root).\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
@@ -2030,18 +1967,18 @@ msgstr ""
 "                   distribuição. Isso permite consultar essa\n"
 "                   distribuição.\n"
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - imprime 'changelog'.\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 "  -d             - estende a consulta para as dependências dos pacotes.\n"
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -2050,53 +1987,108 @@ msgstr ""
 "  -u             - remove um pacote se uma versão mais atual\n"
 "                   já estiver instalada.\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - lista completa dos pacotes a remover.\n"
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - busca reversa para o que requer o pacote.\n"
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 "  -i             - imprime informações úteis em formato que pode ser lido\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - imprime grupos, com nome também.\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - imprime versão e 'release' com nome também.\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - lista os arquivos do pacote.\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr " nomes ou arquivos rpm dados na linha de comando são consultados \n"
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: opção desconhecida \"-%s\", verifique usando opção --help\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: não pode ler o arquivo rpm \"%s\"\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes só pode ser usado com --parallel"
+
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "Software de aquisição desconhecido`%s' !!!\n"
+
+#~ msgid "copy failed: %s"
+#~ msgstr "falha na cópia: %s"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "Está faltando o software 'wget'\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "wget falhou: saiu com %d ou sinal %d\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "Está faltando o software 'curl'\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "curl falhou: saiu com %d ou sinal %d\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "Está faltando o software 'rsync'\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "rsync falhou: saiu com %d ou sinal %d\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "Está faltando o software 'ssh'\n"
+
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpme: opção desconhecida \"-%s\", cheque o uso com a opção --help\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmi: opção desconhecida \"-%s\", confira o uso com opção --help\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr ""
+#~ "Para satisfazer as dependências, os seguintes pacotes serão instalados (%"
+#~ "d MB)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "não precisa dar <caminho relativo do hdlist> com --distrib"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "<caminho relativo do hdlist> faltando\n"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "`with' faltando para mídia da rede\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmq: opção desconhecida \"-%s\", verifique usando opção --help\n"
diff --git a/po/ro.po b/po/ro.po
index 24a9b175..03bd8e84 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-ro\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2004-02-20 08:39+0100\n"
 "Last-Translator: Harald Ersch <harald@ersch.ro>\n"
 "Language-Team: Romanian\n"
@@ -54,22 +54,22 @@ msgstr ""
 "Instalare automată a pachetelor...\n"
 "Aţi cerut instalarea pachetului %s\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "Este OK?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Renunţă"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (D/n) "
@@ -79,124 +79,63 @@ msgstr " (D/n) "
 msgid "%s: command not found\n"
 msgstr "%s: comanda nu a fost găsită\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "where [options] are from\n"
 msgstr ""
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - afişează acest mesaj de ajutor.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, fuzzy, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "  --group        - afişare etichetă grup: grup.\n"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, fuzzy, c-format
 msgid "                    defaults is %s.\n"
 msgstr "  -l         - listează fişierele din pachet.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Webfetch necunoscut `%s' !!!\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "protocol necunoscut definit pentru %s"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "nu gasesc webfech, versiunile suportate sunt: %s\n"
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "nu pot folosi protocolul: %s"
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "copierea a eşuat: %s"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "wget lipseşte\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget eşuat: ieşire cu %d sau semnal %d\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "curl lipseşte\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl eşuat: ieşire cu %d sau semnal %d\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "rsync lipseşte\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "rsync eşuat: ieşire cu %d sau semnal %d\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "ssh lipseşte\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% din %s terminat, ETA = %s, viteza = %s"
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% terminat, viteza = %s"
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...copierea eşuată: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "sintaxă eronată în fişierul de configurare la linia %s"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 "mediul \"%s\" încearcă să folosească un hdlist deja folosit, mediul este "
 "ignorat"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 "mediul \"%s\" încearcă să folosească o listă deja folosită, mediul este "
 "ignorat"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -205,41 +144,41 @@ msgstr ""
 "nu pot să mă ocupde mediul \"%s\" pentru că fişierul listă este deja folosit "
 "de alt mediu"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 "nu pot folosi numele \"%s\" pentru mediul fără nume pentru că este deja "
 "folosit"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 "nu pot să iau în considerare mediul \"%s\" pentru că nu există nici un "
 "fişier listă [%s]"
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "nu pot determina mediul pentru acest fişier hdlist [%s]"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "nu pot accesa fişierul hdlist pentru \"%s\", ignor mediul"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "nu pot accesa fişierul listă pentru \"%s\", ignor mediul"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "încerc să sar pentru mediul existent \"%s\", evitare"
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -248,93 +187,93 @@ msgstr ""
 "mediul virtual \"%s\" nu ar trebui să folosească un hdlist deja definit, "
 "mediul este ignorat"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr ""
 "mediul virtual \"%s\" ar trebui să aibă un URL clar, mediul este ignorat"
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "nu pot găsi fişierul hdlist pentru \"%s\", mediul a fost ignorat"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "nu pot să găsesc fişierul listă pentru \"%s\", mediul a fost ignorat"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "fişier listă incoerent pentru \"%s\", mediul a fost ignorat"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "nu pot inspecta fişierul listă pentru \"%s\", mediul a fost ignorat"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "prea multe puncte de montare pentru mediul \"%s\""
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "consider dispozitivul mobil ca \"%s\""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "folosesc dispozitive mobile diferite [%s] pentru \"%s\""
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "nu pot obţine calea pentru mediul \"%s\""
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "nu pot scrie în fişierul de configurare [%s]"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "scriere fişier de configurare [%s]"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "Nu pot utiliza modul paralel in modul use-distrib"
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "nu pot parcurge \"%s\" în fişierul [%s]"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "examinez descriptorul paralel din fişierul [%s]"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "am găsit descriptorul paralel pentru nodurile: %s"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "utilizez mediile asociate pentru modul paralel: %s"
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "nu pot folosi opţiunea parallel \"%s\""
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -343,90 +282,90 @@ msgstr ""
 "--synthesis nu poate fi folosit cu --media, --excludemedia, sortmedia, --"
 "update sau --parallel"
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "examinez fişierul synthesis [%s]"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "examinez fişierul hdlist [%s]"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "mediul virtual \"%s\" nu este local, mediul este ignorat"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "Problemă la citirea fişierului hdlist/synthesis al mediului \"%s\""
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "efectuez a doua parcurgere pentru a calcula dependenţele\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "salt peste pachetul %s"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "ar fi instalat în loc de actualizare pt. pachetul %s"
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "nu pot deschide rpmdb"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "mediul \"%s\" deja există"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr "mediul virtual trebuie să fie local"
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "am adăugat mediul %s"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "nu pot accesa primul mediu de instalare"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "copiez fişierul hdlist..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "...copierea a eşuat"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "...copierea s-a terminat"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
@@ -435,43 +374,49 @@ msgstr ""
 "nu pot accesa primul mediu de instalare (nu am găsit fişierul Mandrake/base/"
 "hdlists)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "obţin fişierul hdlist..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "...copierea este terminată"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...copierea eşuată: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "descriere hdlist invalidă \"%s\" în fişierul hdlists"
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "se încearcă selectarea unui mediu inexistent \"%s\""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "selectez medii multiple: %s"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "elimin mediul \"%s\""
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -482,7 +427,7 @@ msgstr ""
 "asta se poate întampla dacă aţi montat manual directorul când aţi creat "
 "mediul."
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -491,222 +436,222 @@ msgstr ""
 "mediul virtual \"%s\" ar trebui să aibăun hdlist/synthesis valid, mediul "
 "este ignorat"
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "copiez fişierul cu descrieri pentru \"%s\"..."
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "calculez md5sum pentru fişierul sursă hdlist (sau synthesis) existent"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "examinare fişier MD5SUM"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "copiez hdlist (sau synthesis) sursă pentru \"%s\"..."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "copierea fişierului [%s] a eşuat (fişier suspect de mic)"
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "Calculez ms5sum pt. fişierul sursă hdlist/synthesis copiat"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "copierea [%s] a eşuat (eroare md5sum)"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "problemă la citirea fişierului synthesis al mediului \"%s\""
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "citesc fişierele rpm de la [%s]"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "nu pot citi fişierele rpm din [%s]: %s"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "nu a fost găsit nici un fişier rpm de la [%s]"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "copiez hdlist (sau synthesis) sursă pentru \"%s\"..."
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "am găsit hdlist (sau synthesis) verificat ca %s"
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "calculez md5sum a fişierului sursă hdlist/synthesis descărcat"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr "Nepotrivire md5sum"
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "copierea hdlist sursă (sau synthesis) a eşuat"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "nu a fost găsit nici un fişier hdlist pentru mediul \"%s\""
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "fişierul [%s] este deja folosit în acelaşi mediu \"%s\""
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "nu pot percurge fişierul hdlist pentru \"%s\""
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "nu pot scrie fişierul listă pentru \"%s\""
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "scriu fişierul listă pentru mediul \"%s\""
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "nu s-a scris nimic în fişierul listă pentru \"%s\""
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "examinez fişierul cheie publică pentru \"%s\"..."
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...cheia importată %s din fişierul cheie publică pentru \"%s\""
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "nu pot importa fişierul cheie publică pentru \"%s\""
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "citest antetele de pe mediul \"%s\""
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "creez hdlist [%s]"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "am construit fişierul synthesis pentru mediul \"%s\""
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "am găsit %d antete în cache"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "elimin %d antete vechi din cache"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "montez %s"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "demontare %s"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "am relocat %s intrări în depslist"
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "nici o intrare relocată în depslist"
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "nume de fişier rpm invalid [%s]"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "copiere fişier rpm [%s] ..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "nu pot accesa fişierul rpm [%s]"
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "nu pot înregistra fişierul rpm"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "eroare la înregistrarea pachetelor locale"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "nici un pachet numit %s"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Următoarele pachete conţin %s: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "există pachete multiple cu acelaşi nume de fişier rpm \"%s\""
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "nu pot parcurge corect [%s] pentru valoarea \"%s\""
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -715,62 +660,62 @@ msgstr ""
 "mediul \"%s\" foloseşe un fişier listă invalid (oglindirea probabil nu este "
 "actualizată, încerc să folosesc o metodă alternativă)"
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "mediul \"%s\" nu defineşte nici o locaţie pentru fişiere rpm"
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "pachetul %s nu a fost găsit."
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "baza de date urpmi este blocată"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "mediul \"%s\" nu este selectat"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "nu pot citi fişierul rpm [%s] de pe mediul \"%s\""
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "mediu incoerent \"%s\" marcat ca mobil dar nu este aşa"
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "nu pot accesa mediul \"%s\""
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "intrare incorectă: [%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "copiere fişiere rpm de pe mediul \"%s\"..."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "Pregătire..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "folosesc procesul %d pentru executarea tranzacţiei"
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -778,82 +723,97 @@ msgstr ""
 "Tranzacţie creeată pt. instalarea pe %s (ştergere=%d, instalare=%d, "
 "actualizare=%d)"
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr "nNu pot crea tranzacţia"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "şterg pachetul %s"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "nu pot şterge pachetul %s"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "adăugare pachet %s (id=%d, eid=%d, acualiz=%d, fişier=%s)"
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "nu pot instala pachetul %s"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "datorită %s lipsă"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "datorită %s nesatisfăcute"
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr "încerc să promovez %s"
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr "pentru a păstra %s"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "pentru a instala %s"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "datorita conflictelor cu %s"
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr "necerute"
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Semnătură incorectă (%s)"
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "ID cheie incorect (%s)"
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Semnătură lipsă (%s)"
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "declarare proxy greşită în linia de comandă\n"
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: nu pot citi fişierul rpm \"%s\"\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Aţi ales greşit, încercaţi din nou\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -869,43 +829,43 @@ msgstr ""
 "\n"
 "Utilizare:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - afişează acest mesaj de ajutor.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - selectare automată pachet în opţiuni.\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 "  --test         - verifică dacă instalarea poate fi îndeplinită corect.\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 "  --force        - forţează invocarea chiar dacă unele pachete nu există.\n"
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - urpmi distribuit între maşinile cu alias.\n"
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr ""
 "  --root         - foloseşte altă rădăcină pentru instalarea rpm-urilor.\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -915,74 +875,64 @@ msgstr ""
 "distribuţie, utilă\n"
 "                   pt. (dez)instalarea unui  chroot cu opţiunea --root .\n"
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - mod detaliat.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 "  -a             - selectează toate pachetele ce se potrivesc cu expresia.\n"
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: opţiune necunoscută \"-%s\", verificaţi folosirea cu --help\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr "pachete necunoscute "
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "pachet necunoscut "
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "ştergerea pachetului %s va strica sistemul dvs"
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr "Nimic de şters"
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "Verific pt. ştergerea următoarelor pachete"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
 "Pentru a satisface dependenţele, următoarele pachete vor fi şterse (%d MB)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (D/n) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "elimin %s"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr "Ştergere nereuşită"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Aţi ales greşit, încercaţi din nou\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -998,23 +948,23 @@ msgstr ""
 "\n"
 "Utilizare:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - foloseşte numai mediile de actualizare.\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 "  --media        - foloseşte numai mediile date, separate prin virgulă.\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - nu folosi mediile date, separate prin virgulă.\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1022,18 +972,18 @@ msgstr ""
 "  --sortmedia    - sortează mediile conform subşirurilor separate prin "
 "virgulă.\n"
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - foloseşte fişierul synthesis dat în loc de urpmi db.\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "   --verbose      - mod detaliat.\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1044,90 +994,90 @@ msgstr ""
 "eticheta\n"
 "                   în linia de comandă, incompatibil cu modul interactiv).\n"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --uniq         - nu afişează liniile identice.\n"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all          - afişează toate etichetele\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group        - afişare etichetă grup: grup.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size          - afişare etichetă Mărime: mărime.\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --epoch        - afişare etichetă epoch: epoch.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary      - afişare etichetă Sumar: sumar.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description  - afişare etichetă Descriere: descriere.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr "  --sourcerpm    - afişare etichetă sourcepm: sursa rpm.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr "  --packager     - afişare etichetă Împachetat de: packager.\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr "  --buildhost    - afişează eticheta (buildhost): buildhost.\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --url          -  afişare etichetă url: url\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr ""
 "  --provides     - afişează eticheta Oferă: tot ce oferă (linii multiple).\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr "  --requires     - afişează eticheta Necesită: toate necesităţile.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files        - afişează eticheta Fişiere: toate fişierele.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr ""
 "  --conflicts     - afişează eticheta Conflicte: toate conflictele (linii "
 "multiple).\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr "  --obsoletes    - afişează eticheta Perimat: toate perimatele.\n"
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
@@ -1136,23 +1086,23 @@ msgstr ""
 "  --env          - foloseşte un mediu specificat (tipic un raport\n"
 "                   de erori).\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
 "  -i             - ignoră diferenţierea majusculelor în toate modelele.\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - afişează versiune, ediţie şi arhitectură cu nume.\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - include codul perl direct ca perl -e.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
@@ -1160,7 +1110,7 @@ msgstr ""
 "  -a             - operator binar ŞI, adevărat dacă ambele expresii sunt "
 "adevărate.\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
@@ -1168,24 +1118,24 @@ msgstr ""
 "  -o             - operator binar SAU, adevărat dacă una dintre expresii "
 "este adevărată.\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  -!             - Negare unară, adevărată dacă expredia este falsă.\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
 "  (              - paranteză stânga pentru deschidere expresii de grup.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
 "  )              - paranteză dreapta pentru închidere expresii de grup.\n"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
@@ -1194,12 +1144,12 @@ msgstr ""
 "răspunsul este:\n"
 "%s\n"
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "folosind mediul specific pe %s\n"
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1215,20 +1165,20 @@ msgstr ""
 "\n"
 "Utilizare:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - foloseşte fişierul synthesis dat în loc de urpmi db.\n"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 "  --auto-select  - selectare automată pachete pentru actualizare sistem.\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
@@ -1237,7 +1187,7 @@ msgstr ""
 "  --no-uninstall -nu se dezinstalează pachete niciodată, renunţă la "
 "instalare.\n"
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1246,7 +1196,7 @@ msgstr ""
 "  --keep         - păstrează pachetele existente dacă este posibil, refuză\n"
 "                   pachetele cerute dacă duc la eliminări lor.\n"
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1257,39 +1207,39 @@ msgstr ""
 "                   sau actualiza mai multe pachete decât date,\n"
 "                   implicit este %d.\n"
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - lungime tranzacţii mici, implicit este %d.\n"
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy             - impune căutarea fuzzy (identic cu -y).\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 "  --src          - pachetul următor este un pachet sursă ( identic cu -s).\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - instalează numai pachetele sursă (fără binare).\n"
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 "  --clean        - şterge rpm-urile din cache înainte de orice altceva.\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - păstreză rpm-urile nefolosite în cache.\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1299,7 +1249,7 @@ msgstr ""
 "pachetelor fără\n"
 "                   verificarea dependenţelor\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1309,7 +1259,7 @@ msgstr ""
 "                   pachetelor fără verificarea dependenţelor şi a "
 "integrităţii.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1319,26 +1269,26 @@ msgstr ""
 "distribuţie, utilă\n"
 "                   pt. instalarea unui  chroot cu opţiunea --root .\n"
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 "  --wget         - foloseşte wget pentru obţinerea fişierelor de la "
 "distanţă.\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 "  --curl         - foloseşte curl pentru obţinerea fişierelor de la "
 "distanţă.\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - limitează viteza de descărcare.\n"
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1348,7 +1298,7 @@ msgstr ""
 "                   (--no-resume  dezactivează opţiunea, implicit este "
 "dezactivată).\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1358,7 +1308,7 @@ msgstr ""
 "considerat a fi\n"
 "                   implicit 1080 (formatul este <gazdăproxy[:port]>).\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1368,7 +1318,7 @@ msgstr ""
 "proxy\n"
 "                   (formatul este <utilizator:parolă>).\n"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1377,12 +1327,12 @@ msgstr ""
 "  --bug          - produce un raport de erori în directorul indicat de \n"
 "                   argumentul următor.\n"
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - foloseşte interfaţa X.\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1392,7 +1342,7 @@ msgstr ""
 "lucru:\n"
 "                   X sau mod text.\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1402,77 +1352,66 @@ msgstr ""
 "                   (--no-verify-rpm o dezactivează, implicit este "
 "activată).\n"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - exclude calea separată prin virgulă.\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - exclude fişierele documentaţie.\n"
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - selectează toate potrivirile în linia de comandă.\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 "  -p             - permite căutarea în Provides pentru găsirea pachetelor.\n"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - nu căuta în Provides pentru găsirea pachetelor.\n"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - impune căutarea fuzzy (identic cu --fuzzy).\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 "  -s             - pachetul următor este un pachet sursă (identic cu -src).\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - mod silenţios.\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 "  numele sau fişierele rpm date în linia de comandă vor fi instalate.\n"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr "Alegeţi locul unde salvez fişierul"
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "declarare proxy greşită în linia de comandă\n"
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: opţiune necunoscută \"-%s\", verificaţi folosirea cu --help\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 "Ce se poate face cu fişierele rpm binare când se foloseşte --install-src"
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1493,22 +1432,22 @@ msgstr ""
 "\n"
 "Ce doriţi să faceţi?"
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "Nu fă nimic"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr "Da, instalează-l"
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr "Salvare fişier"
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1524,12 +1463,12 @@ msgstr ""
 "\n"
 "În schimb, îl puteţi salva doar. Ce alegeţi?"
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, c-format
 msgid "Install it"
 msgstr "Instalează"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1538,42 +1477,42 @@ msgstr ""
 "Directorul [%s] există deja, folosiţi un alt director pt. raportarea "
 "erorilor sau ştergeţi-l"
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Nu pot creea directorul [%s] pentru raportul de erori"
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Doar superutilizatorul poate instala pachete"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "Unul din următoarele pachete e necesar pt. instalarea %s:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Unul din următoarele pachete e necesar:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Ce alegeţi? (1-%d) "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "Instalare pachete..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "Iniţializare..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1582,12 +1521,12 @@ msgstr ""
 "Unele pachete cerute nu pot fi instalate:\n"
 "%s"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr "Sunteţi de acord?"
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1598,7 +1537,7 @@ msgstr ""
 "trebuie şterse pentru ca altele să fie actualizate:\n"
 "%s\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1607,16 +1546,16 @@ msgstr ""
 "Unrmătoarele pachete trebuie şterse pentru ca altele să fie actualizate:\n"
 "%s"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
 "Pentru a satisface dependenţele, următoarele pachete vor fi instalate (% d "
 "MB)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1625,37 +1564,47 @@ msgstr ""
 "Trebuie să fiţi root pentru a instala următoarele pachete dependente:\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "Nu pot prelua pachetele sursă, întrerup"
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Vă rog să introduceţi mediul numit \"%s\" în dispozitivul [%s]"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Apăsaţi Enter când e gata..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Descarc pachetul `%s'..."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% din %s terminat, ETA = %s, viteza = %s"
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% terminat, viteza = %s"
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Următoarele pachete au semnături greşite"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Doriţi să continuaţi instalarea?"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1666,57 +1615,57 @@ msgstr ""
 "%s\n"
 "Probabil ar trebui să actualizaţi baza de date urpmi."
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "Instalarea a eşuat"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr "distribui %s"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr "instalez %s"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instalarea pachetului `%s' (%s/%s)..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Să încerc instalarea fără verificarea dependenţelor? (d/N) "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Încearcă instalarea încă şi mai dur (--force)? (d/N) "
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d tranzacţii de instalarea eşuate"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "Instalarea este posibilă"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "totul este deja instalat"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr "repornesc urpmi"
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1740,23 +1689,23 @@ msgstr ""
 "\n"
 "şi [opţiuni] sunt dintre\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - creează un mediu de actualizare.\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
 "  --probe-synthesis - încearcă găsirea şi folosirea fişierelor synthesis.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr "  --probe-hdlist - încearcă găsirea şi folosirea fişierelor hdlist.\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
@@ -1765,7 +1714,7 @@ msgstr ""
 "  -no-probe     - nu încerca găsirea şi folosirea fişierelor\n"
 "                   synthesis sau hdlist.\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -1774,7 +1723,7 @@ msgstr ""
 "  --distrib      - crearea automată a tuturor mediilor de pe un mediu\n"
 "                   de instalare.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1785,7 +1734,7 @@ msgstr ""
 "                   distribuţii, XXX poate fi main, contrib, updates sau\n"
 "                   orice altceva a fost configurat ;-)\n"
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1795,7 +1744,7 @@ msgstr ""
 "implicit este \n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1808,7 +1757,7 @@ msgstr ""
 "raportată\n"
 "                   de pachetul mandrake-release instalat.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
@@ -1818,7 +1767,7 @@ msgstr ""
 "arhitectura\n"
 "                   ediţiei Mandrake instalată\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
@@ -1827,74 +1776,53 @@ msgstr ""
 "  --virtual      - creează mediu virtual ce sunt actualizate continuu,\n"
 "                   este permis numai protocolul file://.\n"
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 "  --no-md5sum    - dezactivează verificarea fişierelor folosind MD5SUM.\n"
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - curăţă directorul cache antete.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - forţează generarea fişierelor hdlist.\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"opţiuni necunoscute '%s'\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "nu pot adăuga actualizări de la o distribuţie Cooker\n"
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "obţin oglindirile de la %s ..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"nu e nevoie să daţi <calea relativă pt. hdlist> cu --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "nu e nevoie să daţi <calea relativă pt. hdlist> cu --distrib"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "nu pot actualiza mediul \"%s\"\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"lipseşte <calea relativă a hdlist>\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "lipseşte <calea relativă a hdlist>\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"`with' lipseşte pentru mediul tip reţea\n"
+msgid "`with' missing for network media\n"
+msgstr "`with' lipseşte pentru mediul tip reţea\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "Nu pot creea mediul \"%s\"\n"
@@ -1913,6 +1841,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - selectează toate mediile.\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"opţiuni necunoscute '%s'\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1927,7 +1864,7 @@ msgstr ""
 "intrarea de şters lipseşte\n"
 "(una din %s)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1936,28 +1873,28 @@ msgstr ""
 "Utilizare: urpmi.update [opţiuni] <nume>...\n"
 "unde <nume> este numele mediului de actualizat.\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - foloseşte numai mediile de actualizare.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr "  --force-key    - forţează actualizarea cheii gpg.\n"
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - selectează toate mediile nedemontabile.\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "nimic de actualizat (folosiţi urpmi.addmedia pentru a adăuga un mediu)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1966,7 +1903,7 @@ msgstr ""
 "intrarea de actualizat lipseşte\n"
 "(una din %s)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1982,22 +1919,22 @@ msgstr ""
 "\n"
 "Utilizare:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - listează pachetele disponibile.\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - listează mediile disponibile.\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url   - listează mediile disponibile şi URL-ul lor.\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
@@ -2005,19 +1942,19 @@ msgstr ""
 "  --dump-config  - afişează configurarea in formatul argumentului urpmi."
 "addmedia.\n"
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 "  --list-nodes   - listează nodurile disponibile când se foloseşte --"
 "parallel.\n"
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - listează alias-urile paralele disponibile.\n"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
@@ -2026,7 +1963,7 @@ msgstr ""
 "  --headers      - extrage antete pentru pachetul listat din urpmi db la\n"
 "                   stdout (numai root).\n"
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
@@ -2034,7 +1971,7 @@ msgstr ""
 "  --sources      - dă toate pachetele sursă înainte de descărcare (numai "
 "root).\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
@@ -2044,17 +1981,17 @@ msgstr ""
 "distribuţie.\n"
 "                   Aceasta permite interogarea unei distribuţii.\n"
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog          - afişează jurnalul modificărilor\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - extinde interogarea la dependenţele pachetelor.\n"
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -2063,57 +2000,114 @@ msgstr ""
 "  -u             - şterge pachetul dacă o versiune mai recentă este deja "
 "instalată.\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - ieşire completă cu pachetul ce va fi şters.\n"
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 "  -R             - căutare inversă în lista de dependenţe a pachetului.\n"
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 "  -i             - afişează informaţii utile pentru utilizatorul uman.\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - arată grupurile şi cu nume.\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - afişează versiunea şi ediţia cu nume.\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l         - listează fişierele din pachet.\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  numele sau fişierele rpm date în linia de comandă sunt interogate.\n"
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: opţiune necunoscută \"-%s\", verificaţi folosirea cu --help\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: nu pot citi fişierul rpm \"%s\"\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes poate fi folosit numai cu --parallel"
 
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "Webfetch necunoscut `%s' !!!\n"
+
+#~ msgid "copy failed: %s"
+#~ msgstr "copierea a eşuat: %s"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "wget lipseşte\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "wget eşuat: ieşire cu %d sau semnal %d\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "curl lipseşte\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "curl eşuat: ieşire cu %d sau semnal %d\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "rsync lipseşte\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "rsync eşuat: ieşire cu %d sau semnal %d\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "ssh lipseşte\n"
+
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpme: opţiune necunoscută \"-%s\", verificaţi folosirea cu --help\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpmi: opţiune necunoscută \"-%s\", verificaţi folosirea cu --help\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr ""
+#~ "Pentru a satisface dependenţele, următoarele pachete vor fi instalate (% "
+#~ "d MB)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "nu e nevoie să daţi <calea relativă pt. hdlist> cu --distrib"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "lipseşte <calea relativă a hdlist>\n"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "`with' lipseşte pentru mediul tip reţea\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpmq: opţiune necunoscută \"-%s\", verificaţi folosirea cu --help\n"
+
 #~ msgid "no webfetch (curl or wget currently) found\n"
 #~ msgstr "Nu am găsit webfetch (acum curl sau wget)\n"
diff --git a/po/ru.po b/po/ru.po
index 35afdbee..64ac6b36 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2004-03-18 23:16+0200\n"
 "Last-Translator: Alice Lafox <alice@lafox.net>\n"
 "Language-Team: Russian <cooker-i18n@linux-mandrake.com>\n"
@@ -54,22 +54,22 @@ msgstr ""
 "Автоматическая установка пакетов...\n"
 "Вы запросили установку пакета %s\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "Это правильно?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "OК"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Отмена"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) "
@@ -79,7 +79,7 @@ msgstr " (Y/n) "
 msgid "%s: command not found\n"
 msgstr "%s: команда не найдена\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
@@ -88,117 +88,56 @@ msgstr ""
 "использование: %s [параметры]\n"
 "где [параметры] такие\n"
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help         - вывести эту подсказку.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "   -g [group]        - ограничить результаты данной группой.\n"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, c-format
 msgid "                    defaults is %s.\n"
 msgstr "                    по умолчанию %s.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Неизвестный webfetch `%s' !!!\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "для %s определен неизвестный протокол"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "не найден webfetch, поддерживается webfetch: %s\n"
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "невозможно обработать протокол: %s"
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "копирование завершилось неудачей: %s"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "wget отсутствует\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget дал сбой: завершен с %d или сигналом %d\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "curl отсутствует\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl дал сбой: завершен с %d или сигналом %d\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "rsync отсутствует\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "rsync дал сбой: завершен с %d или сигналом %d\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "ssh отсутствует\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        выполнено %s%% из %s, ETA = %s, скорость = %s"
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        выполнено %s%%, скорость = %s"
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...получить не удалось: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "синтаксическая ошибка в config файле в строке %s"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 "источник \"%s\" пытается использовать уже задействованный hdlist, источник "
 "игнорируется"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 "источник \"%s\" пытается использовать уже использующийся список, источник "
 "игнорируется"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -207,41 +146,41 @@ msgstr ""
 "невозможно сберечь источник \"%s\" так как файл списка уже используется "
 "другим источником"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 "невозможно использовать название \"%s\" для неименованного носителя. Имя уже "
 "занято"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 "невозможно принять во внимание источник \"%s\" так как не существует файла "
 "списка [%s]"
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "невозможно определить источник данного файла hdlist [%s]"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "нет доступа к файлу hdlist для \"%s\", источник игнорируется"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "нет доступа к файлу списка источника \"%s\", источник игнорируется"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "попытка обойти существующий источник \"%s\", отменяется"
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -250,95 +189,95 @@ msgstr ""
 "виртуальный источник \"%s\"не должен иметь определенный файл hdlist или файл "
 "списка, источник игнорируется"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr ""
 "виртуальный источник \"%s\" должен содержать пустой url, источник "
 "игнорируется"
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "не получается найти hdlist файл для \"%s\", источник игнорируется"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "не получается найти файл списка для \"%s\", источник игнорируется"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "несвязанный файл списка для \"%s\", источник игнорируется"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "не получается проверить файл списка для \"%s\", источник игнорируется"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "слишком много точек монтирования для съемного источника \"%s\""
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "принимается съемное устройство как \"%s\""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "используется другое съемное устройство [%s] для \"%s\""
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "невозможно получить путь к съемному источнику \"%s\""
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "не получается записать config файл [%s]"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "записать config файл [%s]"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 "Не могу использовать параллельный режим совместно с use-distrib режимом"
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "невозможно разобрать \"%s\" в файле [%s]"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "проверяется параллельный обработчик в файле [%s]"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "найден параллельный обработчик для узлов: %s"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "используется связанный носитель для параллельного режима: %s"
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "невозможно использовать параллельную опцию \"%s\""
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -347,91 +286,91 @@ msgstr ""
 "--synthesis не может быть использован с --media, --excludemedia, --"
 "sortmedia, --update или --parallel"
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "проверяется файл synthesis [%s]"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "проверяется файл hdlist [%s]"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr ""
 "виртуальный источник \"%s\" не является локальным, источник игнорируется"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "проблема чтения файла hdlist или synthesis источника \"%s\""
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "производится второй проход вычисления зависимостей\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "пропускается пакет %s"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "будет произведена установка вместо обновления пакета %s"
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "невозможно открыть rpmdb"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "источник \"%s\" уже существует"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr "виртуальный источник должен быть локальным"
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "добавлен источник %s"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "нет доступа к первому источнику инсталляции"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "копируется файл hdlists..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "...копирование не удалось"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "...копирование выполнено"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
@@ -440,43 +379,49 @@ msgstr ""
 "нет доступа к первому источнику инсталляции (не найден файл Mandrake/base/"
 "hdlists)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "извлекается файл hdlists..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "...получение выполнено"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...получить не удалось: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "неверное описание hdlist \"%s\" в файле hdlists "
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "попытка выбрать несуществующий источник \"%s\""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "выбирается составной источник: %s"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "удаляется источник \"%s\""
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -486,7 +431,7 @@ msgstr ""
 "нет доступа к источнику \"%s\",\n"
 "так бывает если вы вручную монтировали каталог когда создавали источник."
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -495,222 +440,222 @@ msgstr ""
 "виртуальный источник \"%s\" должен иметь правильный исходный hdlist или "
 "synthesis, источник игнорируется"
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "копируется файл описания для \"%s\"..."
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "вычисляется md5sum существующего исходного hdlist (или synthesis)"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "проверяется файл MD5SUM"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "копируется исходный hdlist (или synthesis) \"%s\"..."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "копирование [%s] не удалось (файл подозрительно короткий)"
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "вычисляется md5sum скопированного исходного hdlist (или synthesis)"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "копия [%s] не получилась (не совпадает md5sum)"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "проблема чтения файла synthesis источника \"%s\""
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "читаются rpm файлы из [%s]"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "невозможно прочитать rpm файлы из [%s]: %s"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "не найдены rpm файлы в [%s]"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "получение исходного hdlist (или synthesis) из \"%s\"..."
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "найден искомый hdlist (или synthesis): %s"
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "вычисляется md5sum полученного исходного hdlist (или synthesis)"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr "несоответствие md5sum"
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "извлечение исходного hdlist (или synthesis) не удалось"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "не найден файл hdlist для источника \"%s\""
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "файл [%s] уже используется в похожем источнике \"%s\""
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "невозможно разобрать файл hdlist источника \"%s\""
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "не удается записать файл списка для \"%s\""
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "записывается файл списка для источника \"%s\""
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "в файл списка для \"%s\" ничего не записано"
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "проверяется файл открытого ключа для \"%s\"..."
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...импортирован ключ %s из файла открытого ключа \"%s\""
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "невозможно импортировать файл открытого ключа \"%s\""
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "читаются заголовки из источника \"%s\""
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "построение hdlist [%s]"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "создан файл hdlist synthesis для источника \"%s\""
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "найдено %d заголовков в кэше"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "удаляются %d устаревших заголовков в кэше"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "монтируется %s"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "отмонтируется %s"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "перенесено %s записей в depslist"
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "ни одной записи не перенесено в depslist"
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "неверное имя rpm файла [%s]"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "извлекается rpm файл [%s] ..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "нет доступа к rpm файлу [%s]"
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "не удается зарегистрировать rpm файл"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "ошибка регистрации локальных пакетов"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "нет пакета с именем %s"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Следующие пакеты содержат %s: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "существует несколько пакетов с одинаковым именем rpm файла \"%s\""
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "невозможно правильно разобрать [%s] в \"%s\""
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -719,144 +664,159 @@ msgstr ""
 "источник \"%s\" использует неверный файл списка:\n"
 "  возможно зеркало устарело, попытка использовать альтернативный метод"
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "источник \"%s\" не определяет местонахождение файлов rpm"
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "пакет %s не найден."
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "база данных urpmi заблокирована"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "источник \"%s\" не выбран"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "невозможно прочитать rpm файл [%s] из источника \"%s\""
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "непонятный источник \"%s\" отмечен как съемный, но это не так"
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "нет доступа к источнику \"%s\""
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "неверно сформированный ввод: [%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "идет получение файлов rpm из источника \"%s\"..."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "Подготовка..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "процесс %d используется для выполнения транзакции"
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 "создана транзакция для установки на %s (remove=%d, install=%d, upgrade=%d)"
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr "невозможно создать транзакцию"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "удаляется пакет %s"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "невозможно удалить пакет %s"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "добавляется пакет %s (id=%d, eid=%d, update=%d, file=%s)"
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "невозможно установить пакет %s"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "из-за отсутствия %s"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "из-за неудовлетворенности %s"
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr "попытка активизировать %s"
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr "чтобы сохранить %s"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "чтобы установить %s"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "из-за конфликтов с %s"
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr "незапрошенный"
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Неверная подпись (%s)"
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "Неверный Key ID (%s)"
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Отсутствует подпись (%s)"
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "неверно указан proxy в командной строке\n"
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: не могу прочитать rpm файл \"%s\"\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Извините, плохой выбор, попробуйте снова\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -873,24 +833,24 @@ msgstr ""
 "\n"
 "использование:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - вывести эту подсказку.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - автоматически выбрать пакет из предложенных.\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr "  --test         - проверять на возможность корректной установки.\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
@@ -898,17 +858,17 @@ msgstr ""
 "  --force        - принудительно выполнить, даже если некоторые пакеты не \n"
 "                   существуют.\n"
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - urpmi, распределенный по алиасам машин.\n"
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - использовать другой корень для установки rpm.\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -917,72 +877,62 @@ msgstr ""
 "  --use-distrib  - настраивать urpmi на лету из дерева distrib, полезно\n"
 "                   для (де)установки в chroot вместе с параметром  --root.\n"
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - подробный режим.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - выбрать все пакеты, соответствующие выражению.\n"
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: неизвестная опция \"-%s\", список опций см. --help\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr "неизвестные пакеты"
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "неизвестный пакет"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "удаление пакета %s нарушит работу вашей системы"
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr "Нечего удалять"
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "Проверяется возможность удаления следующих пакетов"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr "Для удовлетворения зависимостей следующие пакеты будут удалены (%d Мб)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (y/N) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "удаляется %s"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr "Удаление завершилось неудачей"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Извините, плохой выбор, попробуйте снова\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -999,26 +949,26 @@ msgstr ""
 "\n"
 "использование:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - использовать только источник обновления.\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 "  --media        - использовать только указанные источники, разделенные "
 "запятыми.\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 "  --excludemedia - не использовать указанные источники, разделенные "
 "запятой.\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1026,17 +976,17 @@ msgstr ""
 "  --sortmedia    - сортировать источники по подстрокам, разделенным\n"
 "                   запятой.\n"
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr "  --synthesis    - использовать synthesis вместо urpmi db.\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - подробный режим.\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1047,87 +997,87 @@ msgstr ""
 "                   задан в командной строке, несовместим с интерактивным \n"
 "                   режимом).\n"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --uniq         - не выводить идентичные строки.\n"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all           - выводить все тэги.\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group        - выводить тэг group: группа.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size         - выводить тэг size: размер.\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --epoch        - выводить тег epoch: epoch.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary      - выводить тэг summary: общие сведения.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description  - выводить тэг description: описание.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr "  --sourcerpm    - выводить тэг sourcerpm: исходный rpm.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr "  --packager     - вывести тэг packager: создатель пакета.\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr "  --buildhost    - вывести тэг buildhost: хост, на котором создан.\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --url          - выводить тэг url: url.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr "  --provides     - выводить тэг provides: все поставляемые файлы.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr "  --requires     - выводить тэг requires: все зависимости.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files        - выводить тэг files: все файлы.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr "  --conflicts    - выводить тэг conflicts: все конфликты.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr "  --obsoletes    - выводить тэг obsoletes: все устаревшие файлы.\n"
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
@@ -1136,22 +1086,22 @@ msgstr ""
 "  --env          - использовать специфическое окружение (обычно отчет\n"
 "                   об ошибке).\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr "  -i             - игнорировать различия регистров во всех шаблонах.\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - выводить версию, релиз и архитектуру с названием.\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - включать код perl непосредственно как perl -e.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
@@ -1159,7 +1109,7 @@ msgstr ""
 "  -a             - двоичный оператор AND, возвращает true, если оба\n"
 "                   выражения истинны.\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
@@ -1167,23 +1117,23 @@ msgstr ""
 "  -o             - бинарный оператор OR, возвращает true, если одно\n"
 "                   из выражений true.\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 "  !              - унарный NOT, возвращает true, если выражение false.\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr "  (              - левая скобка, открывающая группу выражений.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr "  )              - правая скобка, закрывающая группу выражений.\n"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
@@ -1192,12 +1142,12 @@ msgstr ""
 "обратный вызов :\n"
 "%s\n"
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "используется специфическое окружение для %s\n"
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1214,19 +1164,19 @@ msgstr ""
 "\n"
 "использование:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - использовать указанный synthesis вместо urpmi db.\n"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 "  --auto-select  - автоматически выбрать пакеты для обновления системы.\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
@@ -1234,7 +1184,7 @@ msgid ""
 msgstr ""
 "  --no-uninstall - никогда не предлагать удалять пакет, прервать установку.\n"
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1243,7 +1193,7 @@ msgstr ""
 "  --keep         - сохранить по возможности существующие пакеты, отклонить\n"
 "                   запрошенные пакеты, которые ведут к удалению.\n"
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1255,42 +1205,42 @@ msgstr ""
 "                   пакеты кроме указанных,\n"
 "                   по умолчанию %d.\n"
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - длина маленькой транзакции, по умолчанию %d.\n"
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
 "  --fuzzy        - задать поиск на основе нечеткой логики (аналогично -y).\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 "  --src          - следующий пакет является исходным пакетом (аналогично -"
 "s).\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 "  --install-src  - устанавливать только пакеты с исходным кодом\n"
 "                   (бинарники пропустить).\n"
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - перед началом операции удалить rpm из кэша.\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - сохранить в кэше неиспользованный rpm.\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1299,7 +1249,7 @@ msgstr ""
 "  --allow-nodeps - позволяет спрашивать пользователя устанавливать\n"
 "                   пакеты без проверки зависимостей.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1308,7 +1258,7 @@ msgstr ""
 "  --allow-force  - разрешить спрашивать у пользователя об установке\n"
 "                   пакетов без проверки зависимостей и целостности.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1317,23 +1267,23 @@ msgstr ""
 "  --use-distrib  - настраивать urpmi на лету из дерева distrib, полезно\n"
 "                   для (де)установки в chroot вместе с параметром --root.\n"
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 "  --wget          - использовать wget для получения удаленных файлов.\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - использовать curl для получения удаленных файлов.\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - ограничить скорость скачивания.\n"
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1342,7 +1292,7 @@ msgstr ""
 "  --resume       - продолжить трансфер частично закачанных файлов\n"
 "                   (--no-resume отключает это, по умолчанию отключено).\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1351,7 +1301,7 @@ msgstr ""
 "  --proxy        - использовать определенный HTTP-прокси, по умолчанию\n"
 "                   используется порт 1080 (формат <proxyhost[:port]>).\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1360,7 +1310,7 @@ msgstr ""
 "  --proxy-user   - указать пользователя и пароль для авторизации на proxy\n"
 "                   (формат <пользователь:пароль>).\n"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1369,12 +1319,12 @@ msgstr ""
 "  --bug          - выводить отчет об ошибках в каталог, определенный\n"
 "                   следующим аргументом.\n"
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - использовать Х-интерфейс.\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1383,7 +1333,7 @@ msgstr ""
 "  --best-output  - выбрать наилучший интерфейс согласно окружению:\n"
 "                   Х или текстовый режим.\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1392,77 +1342,66 @@ msgstr ""
 "  --verify-rpm   - проверять подпись rpm перед установкой\n"
 "                   (--no-verify-rpm отключит ее, по умолчанию включена).\n"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - исключить пути, разделенные запятыми.\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - исключить файлы документации (docs).\n"
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - выбрать все соответствия из командной строки.\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - разрешить поиск в provides, чтобы найти пакеты.\n"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - не использовать provides при поиске пакета.\n"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 "  -y             - задать поиск на основе нечеткой логики(аналогично --"
 "fuzzy).\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 "  -s             - следующий пакет это исходный пакет (аналогично --src).\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - тихий режим (quiet).\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 "  имена или rpm файлы, указанные в командной строке, будут установлены.\n"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr "Укажите куда сохранять файл"
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "неверно указан proxy в командной строке\n"
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: неизвестная опция \"-%s\", список опций см. --help\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr "Что делать с бинарными rpm файлами при использовании --install-src"
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1486,22 +1425,22 @@ msgstr ""
 "\n"
 "Что будем делать?"
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "Ничего не делать"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr "Да, действительно установить его"
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr "Сохранить файл"
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1516,12 +1455,12 @@ msgstr ""
 "\n"
 "Вы можете его просто сохранить. Каков ваш выбор?"
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, c-format
 msgid "Install it"
 msgstr "Установить его"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1530,42 +1469,42 @@ msgstr ""
 "Каталог [%s] уже существует, используйте другой каталог для сообщения о баге "
 "или удалите его"
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Невозможно создать каталог [%s] для вывода отчета об ошибке"
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Только суперпользователю разрешается устанавливать пакеты"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "Необходимо установить один из следующих пакетов %s:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Нужен один из следующих пакетов:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Ваш выбор? (1-%d) "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "Устанавливается пакет..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "Инициализация..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1574,12 +1513,12 @@ msgstr ""
 "Некоторые запрошенные пакеты не могут быть установлены:\n"
 "%s"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr "вы согласны?"
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1590,7 +1529,7 @@ msgstr ""
 "удалены для обновления остальных:\n"
 "%s\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1599,15 +1538,15 @@ msgstr ""
 "Следующие пакеты будут удалены для обновления остальных:\n"
 "%s"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
 "Для удовлетворения зависимостей будут установлены следующие пакеты (%d MB)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1616,37 +1555,47 @@ msgstr ""
 "Вам необходимо иметь права root, чтобы установить следующие зависимости:\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "невозможно получить исходные пакеты, аварийное завершение"
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Пожалуйста, вставьте источник под названием \"%s\" в устройство [%s]"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Нажмите Enter когда будете готовы..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Загружается пакет `%s'..."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        выполнено %s%% из %s, ETA = %s, скорость = %s"
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        выполнено %s%%, скорость = %s"
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Следующие пакеты имеют неверные подписи"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Желаете продолжить установку?"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1657,57 +1606,57 @@ msgstr ""
 "%s\n"
 "Возможно вам необходимо обновить базу данных urpmi"
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "Установка завершилась неудачей"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr "разбрасывается %s"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr "устанавливается %s"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Устанавливается пакет `%s' (%s/%s)..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Попробовать установку без проверки зависимостей? (y/N) "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Попытаться установить насильно (--force)? (y/N)."
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d транзакций установки завершились неудачей"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "Установка возможна."
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "Все уже установлено"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr "urpmi перезапускается"
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1733,30 +1682,30 @@ msgstr ""
 "\n"
 "и [опции] являются одними из\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - создать источник для обновления.\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
 "  --probe-synthesis - попытаться найти и использовать файл synthesis.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr "  --probe-hdlist - попытаться найти и использовать файл hdlist.\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
 "                   hdlist file.\n"
 msgstr "  --no-probe     - не пытаться найти файл synthesis или hdlist.\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -1765,7 +1714,7 @@ msgstr ""
 "  --disrtib      - автоматически создать все источники из инсталляционного\n"
 "                   источника.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1776,7 +1725,7 @@ msgstr ""
 "                   дистрибутива, XXX может быть main, contrib, updates или\n"
 "                   что угодно, что уже было настроено ;-)\n"
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1785,7 +1734,7 @@ msgstr ""
 "  --from         - использовать указанный url для списка зеркал, по\n"
 "                   умолчанию используется %s\n"
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1796,7 +1745,7 @@ msgstr ""
 "                   используется версия дистрибутива, сообщенная\n"
 "                   установленным пакетом mandrake-release.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
@@ -1806,7 +1755,7 @@ msgstr ""
 "                   используется архитектура установленного пакета\n"
 "                   mandrake-release.\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
@@ -1815,73 +1764,52 @@ msgstr ""
 "  --virtual      - создать виртуальный источник, который всегда up-to-date,\n"
 "                   допускается только протокол file://.\n"
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - не проверять MD5SUM файла.\n"
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - очистить каталог кэша заголовков.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - принудительно создать файлы hdlist.\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"неизвестные опции '%s'\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "невозможно добавить обновления дистрибутива cooker\n"
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "извлекаются зеркала из %s ..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"не нужно указывать <относительный путь к hdlist> с --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "не нужно указывать <относительный путь к hdlist> с --distrib"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "невозможно обновить источник \"%s\"\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"<относительный путь к hdlist> отсутствует\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<относительный путь к hdlist> отсутствует\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"`with' отсутствует для сетевого источника\n"
+msgid "`with' missing for network media\n"
+msgstr "`with' отсутствует для сетевого источника\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "невозможно создать источник \"%s\"\n"
@@ -1900,6 +1828,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - выбрать все источники.\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"неизвестные опции '%s'\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1915,7 +1852,7 @@ msgstr ""
 "(одна из %s)\n"
 
 #
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1924,28 +1861,28 @@ msgstr ""
 "использование: urpmi.update [опции] <имя> ...\n"
 "где <имя> - имя обновляемого источника.\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - обновить только источник обновления.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr "  --force-key    - принудительно обновлять gpg-ключ.\n"
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - выбрать все не-съемные источники данных.\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "нечего обновлять (используйте urpmi.addmedia чтобы добавить источник)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1954,7 +1891,7 @@ msgstr ""
 "запись для обновления отсутствует\n"
 "(одна из %s)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1971,41 +1908,41 @@ msgstr ""
 "\n"
 "использование:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list           - вывести список доступных пакетов.\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - вывести список доступных источников.\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - вывести список доступных источников и их url.\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 "  --dump-config  - сбросить config в виде аргумента для urpmi.addmedia.\n"
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 "  --list-nodes   - вывести список доступных узлов при использовании--"
 "parallel.\n"
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - вывести список доступных параллельных алиасов.\n"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
@@ -2014,7 +1951,7 @@ msgstr ""
 "  --headers      - извлечь заголовки пакетов, перечисленных в urpmi db\n"
 "                   в stdout (только для root).\n"
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
@@ -2022,7 +1959,7 @@ msgstr ""
 "  --sources      - вывести все исходные пакеты перед скачиванием\n"
 "                   (только для root).\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
@@ -2031,17 +1968,17 @@ msgstr ""
 "  --use-distrib  - настраивать urpmi на лету из дерева distrib.\n"
 "                   Опция разрешает опрос дистрибутива.\n"
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - выводить changelog.\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - расширенный запрос к зависимостям пакета.\n"
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -2049,56 +1986,109 @@ msgid ""
 msgstr ""
 "  -u             - удалить пакет если уже установлена более новая версия.\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - выводить все данные о пакете при удалении.\n"
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - искать требуемые пакеты в обратном порядке.\n"
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 "  -i             - вывод полезной информации в удобной для чтения форме.\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - вывести группы вместе с названиями.\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - вывести версию и номер релиза вместе с названием.\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - выводить список файлов пакета.\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  запрошены указанные в командной строке имена или rpm файлы.\n"
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: неизвестная опция \"-%s\", список опций см. --help\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: не могу прочитать rpm файл \"%s\"\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes может использоваться только с --parallel"
 
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "Неизвестный webfetch `%s' !!!\n"
+
+#~ msgid "copy failed: %s"
+#~ msgstr "копирование завершилось неудачей: %s"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "wget отсутствует\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "wget дал сбой: завершен с %d или сигналом %d\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "curl отсутствует\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "curl дал сбой: завершен с %d или сигналом %d\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "rsync отсутствует\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "rsync дал сбой: завершен с %d или сигналом %d\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "ssh отсутствует\n"
+
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpme: неизвестная опция \"-%s\", список опций см. --help\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmi: неизвестная опция \"-%s\", список опций см. --help\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr ""
+#~ "Для удовлетворения зависимостей будут установлены следующие пакеты (%d MB)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "не нужно указывать <относительный путь к hdlist> с --distrib"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "<относительный путь к hdlist> отсутствует\n"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "`with' отсутствует для сетевого источника\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmq: неизвестная опция \"-%s\", список опций см. --help\n"
+
 #~ msgid "no webfetch (curl or wget currently) found\n"
 #~ msgstr "не найден webfetch (в данном случае curl или wget)\n"
diff --git a/po/sk.po b/po/sk.po
index 3853de17..2861d385 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2004-02-10 01:48+0100\n"
 "Last-Translator: Tibor Pittich <Tibor.Pittich@mandrake.org>\n"
 "Language-Team: Slovak <i18n@mandrake.sk>\n"
@@ -47,22 +47,22 @@ msgstr ""
 "Automatická inštalácia balíkov...\n"
 "Je požadovaná inštalácia balíka %s\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "Je to v poriadku?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Zruš"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (Á/n) "
@@ -72,122 +72,61 @@ msgstr " (Á/n) "
 msgid "%s: command not found\n"
 msgstr "%s: príkaz nebol nájdený\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "where [options] are from\n"
 msgstr ""
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - vypísať túto pomoc.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, fuzzy, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "  --group        - vypísať značku skupina: skupina.\n"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, fuzzy, c-format
 msgid "                    defaults is %s.\n"
 msgstr "  -l             - zoznam súborov v balíku.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Neznámy program na získavanie súborov `%s' !!!\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "neznámy protokol definovaný pre %s"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 "nebol nájdený žiaden balík poskytujúci webfetch, podporované sú tieto: %s\n"
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "neznámy protokol: %s"
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "kopírovanie zlyhalo: %s"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "chýba wget\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget neúspešný: skončil s %d alebo signálom %d\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "chýba curl\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl neúspešné: ukončené s %d alebo signálom %d\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "chýba rsync\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "rsync neúspešný: ukončené s %d alebo signálom %d\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "chýbajúce ssh\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% z %s hotové, zostáva = %s, rýchlosť = %s"
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% hotové, rýchlosť = %s"
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...získavanie zlyhalo: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "syntaktická chyba v konfiguračnom súbore na riadku %s"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr "zdroj \"%s\" sa pokúša použiť už použitý hdlist, zdroj je ignorovaný"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 "zdroj \"%s\" skúša použiť už používaný súbor so zoznamom, zdroj je ignorovaný"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -196,41 +135,41 @@ msgstr ""
 "nieje možné používať zdroj \"%s\" ak je súbor so zoznamom použitý s iným "
 "zdrojom"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 "nieje možné použiť meno \"%s\" pre nepomenovaný zdroj pretože je už použité"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 "nieje možné vybrať zdroj \"%s\" pre účet ak neexistuje súbor so zoznamom [%s]"
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "nieje možné určiť zdroj pre tento hdlist súbor [%s]"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 "nieje možné pristúpiť k súboru hdlist pre \"%s\", zdroj bude ignorovaný"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 "nieje možné pristúpiť k súboru s zoznamom pre \"%s\", zdroj bude ignorovaný"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "pokus o vynechanie existujúceho zdroja \"%s\", zrušené"
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -239,93 +178,93 @@ msgstr ""
 "virtuálny zdroj \"%s\" by nemal mať špecifikovaný hdlist súbor, zdroj je "
 "ignorovaný"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr ""
 "virtuálny zdroj \"%s\" by mal obsahovať prázdnu url, zdroj je ignorovaný"
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "nieje možné nájsť hdlist súbor pre \"%s\", zdroj je  ignorovaný"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "nieje možné nájsť súbor so zoznamom pre \"%s\", zdroj je ignorovaný"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "nekoherentný súbor so zoznamom pre \"%s\", zdroj je ignorovaný"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "nieje možné prezrieť súbor so zoznamom pre \"%s\", zdroj je ignorovaný"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "príliš veľa bodov pripojenia pre vymeniteľný zdroj \"%s\""
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "výber vymeniteľného zariadenia ako \"%s\""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "použitie rôznych vymeniteľných zariadení [%s] pre \"%s\""
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "nieje možné zistiť cestu pre vymeniteľný zdroj \"%s\""
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "nieje možné zapísať konfiguračný súbor [%s]"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "zápis konfiguračného súboru [%s]"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "Nie je možné používať paralelný režim pri use-distrib móde"
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "nieje možné správne prečítať \"%s\" v súbore [%s]"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "prehliadanie paralelného ovládača v súbore [%s]"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "nájdený paralélny ovládač pre uzly: %s"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "použitie asociovaného zdroja pre paralelný režim: %s"
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "nieje možné použiť voľbu parallel \"%s\""
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -334,90 +273,90 @@ msgstr ""
 "--synthesis nie je možné používať s --media, --excludemedia, --sortmedia, --"
 "update alebo --parallel"
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "preverovanie synthesis súboru [%s]"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "preverovanie hdlist súboru [%s]"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "virtuálny zdroj \"%s\" nie je lokálny, zdroj je ignorovaný"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "problém s čítaním hdlist alebo synthesis súboru pre zdroj \"%s\""
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "druhý prechod pre výpočet závislostí\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "vynechávanie balíka %s"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "mala by byť vykonaná inštalácia namiesto aktualizácie balíka %s"
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "nemôžem otvoriť rpmdb"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "zdroj \"%s\" už existuje"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr "virtuálny zdroj by mal byť lokálny"
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "pridaný zdroj %s"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "nieje možné pristúpiť k prvému inštalačnému zdroju"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "kopírovanie hdlists súboru..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "...kopírovanie zlyhalo"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "...kopírovanie ukončené"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
@@ -426,43 +365,49 @@ msgstr ""
 "nieje možné pristúpiť k prvému inštalačnému zdroju (nebol nájdený súbor "
 "Mandrake/base/hdlists)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "sťahovanie hdlists súboru..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "...sťahovanie ukončené"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...získavanie zlyhalo: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "nesprávny hdlist popis \"%s\" v hdlists súbore"
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "pokus o výber neexistujúceho zdroja \"%s\""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "výber viacerých zdrojov: %s"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "odstránenie zdroja \"%s\""
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -472,7 +417,7 @@ msgstr ""
 "nieje možné pristúpiť k zdroju \"%s\",\n"
 "čo sa môže stať ak bol adresár pripojený počas vytvárania zdroja."
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -481,222 +426,222 @@ msgstr ""
 "virtuálny zdroj \"%s\" zrejme obsahuje validný zdroj hdlist alebo synthesis, "
 "zroj je ignorovaný"
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "kopírovanie súboru popisov pre \"%s\"..."
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "výpočet md5sum z existujúceho zdroja hdlist (alebo synthesis)"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "overovanie MD5SUM súboru"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "kopírovanie zdrojového hdlist (alebo synthesis) pre \"%s\"..."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "kopírovanie [%s] zlyhalo (súbor je podozrivo malý)"
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "výpočet md5sum zo zdroja hdlist (alebo synthesis)"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "kopírovanie [%s] zlyhalo zlyhalo (nesprávny md5sum)"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "problém s čítaním synthesis súboru pre zdroj \"%s\""
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "čítanie rpm súborov z [%s]"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "nieje možné čítať rpm súbory z [%s]: %s"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "žiadné rpm súbory nájdené z [%s]"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "preberanie zdrojového hdlist (alebo synthesis) pre \"%s\"..."
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "nájdený overený hdlist (alebo synthesis) ako %s"
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "výpočet md5sum zo získaných súborov hdlist (alebo synthesis)"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr "rozdielny md5sum"
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "získavanie zdrojového hdlist (alebo synthesis) súboru zlyhalo"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "nebol nájdený hdlist súbor pre zdroj \"%s\""
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "súbor [%s] už je použitý pre ten istý zdroj \"%s\""
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "nieje možné správne prečítať hdlist súbor pre \"%s\""
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "nieje možné zapísať súbor s zoznamom pre \"%s\""
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "zápis súboru so zoznamom pre zdroj \"%s\""
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "nič nebolo zapísané do zoznamového súboru pre \"%s\""
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "prehliada sa súbor s verejnými kľúčmi \"%s\"..."
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...importuje sa kľúč %s zo súboru s verejnými kľúčmi \"%s\""
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "nie je možné naimportovať súbor s verejnými kľúčmi \"%s\""
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "načitávanie hlavičiek pre zdroj \"%s\""
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "vytváranie hdlist [%s]"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "vytváranie hdlist synthesis súboru pre zdroj \"%s\""
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "nájdených %d hlavičiek v dočasnej pamäti"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "odstránenie %d nepotrebných hlavičiek z dočasnej pamäte"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "pripájanie %s"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "odpája sa %s"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "premiestnené %s položky v depslist"
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "žiadné položky neboli premiestnené v depslist"
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "nesprávne meno rpm súboru [%s]"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "sťahovanie rpm súboru [%s] ..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "nemôžem pristúpiť k rpm súboru [%s]"
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "nieje možné zaregistrovať rpm súbor"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "chyba pri registrácii lokálnych balíkov"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "žiaden balík s menom %s"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Nasledujúce balíky obsahujú %s: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "existuje viacero balíkov s rovnakým menom rpm súboru \"%s\""
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "nieje možné správne prečítať [%s] s hodnotou \"%s\""
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -705,63 +650,63 @@ msgstr ""
 "zdroj \"%s\" používa nekorektný súbor so zoznamom:\n"
 "  mirror zrejme nieje aktualizovaný, skúste alternatívnu metódu"
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "zdroj \"%s\" nedefinuje žiadne umiestnenie rpm súborov"
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "balík %s nebol nájdený."
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi databáza je uzamknutá"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "zdroj \"%s\" nebol zvolený"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "nieje možné prečítať rpm súbor [%s] zo zdroja \"%s\""
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 "nekoherentný zdroj \"%s\" označený ako vymeniteľné, ale nie je tomu tak"
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "nieje možné pristúpiť k zdroju \"%s\""
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "zlé zadaný vstup: [%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "sťahovanie rpm súborov zo zdroja \"%s\"..."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "Príprava..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "používa sa proces %d pre vykonanie transakcie"
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -769,82 +714,97 @@ msgstr ""
 "vytvorenie transakcie pre inštaláciu %s (odstrániť=%d, inštalovať=%d, "
 "aktualizácia=%d)"
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr "nie je možné vytvoriť transakciu"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "odstraňovanie balíka %s"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "nemôžem odinštalovať balík %s"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "pridávanie balíka %s (id=%d, eid=%d, aktualizácia=%d, súbor=%s)"
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "nemôžem nainštalovať balík %s"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "kvôli chýbajucemu %s"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "kvôli neuspokojenému %s"
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr "pokus o povýšenie %s"
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr "pre zachovanie poradia %s"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "pre inštaláciu balíka %s"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "kvôli konfliktom s %s"
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr "nepožadovaný"
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Chybný podpis (%s)"
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "Chybný kľúč (%s)"
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Chýbajúci podpis (%s)"
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "nesprávna deklarácia proxy v príkazovom riadku\n"
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: nieje možné prečítať súbor \"%s\"\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Prepáčte, zlá voľba, skúste znova\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -861,42 +821,42 @@ msgstr ""
 "\n"
 "použitie:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - vypísať túto pomoc.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - automatický výber balíkov v možnostiach.\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr "  --test         - overiť či bude inštalácia vykonaná bez problémov.\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 "  --force        - vynútiť vykonanie aj ak niektoré balíky neexistujú.\n"
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - distribuované urpmi na rôzne stroje.\n"
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr ""
 "  --root         - použiť iný koreňový adresár pre inštaláciu rpm balíkov.\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -906,74 +866,64 @@ msgstr ""
 "vhodné\n"
 "                   pri inštalácii v chroot prostredí s prepínačom --root.\n"
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - vypisovať podrobnosti.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - vyber všetky balíky zodpovedajúce výrazu.\n"
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: neznáma voľba \"-%s\", použitie zistíte s --help\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr "neznáme balíky"
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "neznámy balík"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "odstránenie balíka %s zrejme poškodí váš systém"
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr "Nič na odstránenie"
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "Kontrola odstraňovania týchto balíkov"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
 "Kvôli zachovaniu závislostí, by mali byť odinštalované nasledujúce balíky (%"
 "d MB)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (á/N) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "odstraňovanie %s"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr "Odstránenie neskončilo úspechom"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Prepáčte, zlá voľba, skúste znova\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -990,26 +940,26 @@ msgstr ""
 "\n"
 "použitie:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - použiť iba aktualizačné zroje.\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 "  --media        - použiť len zadané zdroje; viaceré je možné oddeliť "
 "čiarkou.\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 "  --excludemedia - nepoužívať zadané zdroje; viaceré je možné oddeliť "
 "čiarkou.\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1017,17 +967,17 @@ msgstr ""
 "  --sortmedia    - zoradiť zdroje podľa kľúčov; viaceré je možné oddeliť\n"
 "                   čiarkou.\n"
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr "  --synthesis    - použiť zadaný synthesis namiesto urpmi db.\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - mód s viac výpismi.\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1039,88 +989,88 @@ msgstr ""
 "                   v príkazovom riadku čo je nekompatibilné s interaktívnym "
 "módom.).\n"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --uniq         - nevypisovať zhodné riadky.\n"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all          - vypísať všetky značky.\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group        - vypísať značku skupina: skupina.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size         - vypísať značku veľkosť: veľkosť.\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --epoch        - vypísať značku epocha: epocha.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary      - vypísať značku sumár: sumár.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description  - vypísať značku popis: popis.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr "  --sourcerpm    - vypísať značku sourcerpm: zdrojové rpm.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr "  --packager     - vypísať značku packager: packager.\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr "  --buildhost    - vypísať značku buildhost: build host.\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --url          - vypísať značku url: url.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr ""
 "  --provides     - vypísať značku poskytované: všetko čo je poskytované.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr "  --requires     - vypísať značku vyžadované: všetko vyžadované.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files        - vypísať značku súbory: všetky súbory.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr "  --conflicts    - vypísať značku konflikty: všetky konflikty.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr "  --obsoletes    - vypísať značku zastaralé: všetko čo je zastaralé.\n"
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
@@ -1129,22 +1079,22 @@ msgstr ""
 "  --env          - použiť špecifické prostredie (typické pre oznámenie o "
 "chybe).\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr "  -i             - ignorovať veľkosť písma vo vzrokách.\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - vypísať verziu, release a architektúru k menu.\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - vložiť perl kód priamo, podobne ako perl -e.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
@@ -1152,7 +1102,7 @@ msgstr ""
 "  -a             - binárny AND operátor, pravdivý ak sú obidva výrazy "
 "pravdivé.\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
@@ -1160,22 +1110,22 @@ msgstr ""
 "  -o             - binárny OR operátor, pravdivý ak jeden z výrazov je "
 "pravdivý.\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - unárne NOT, pravda ak je výraz nepravdivý.\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr "  (              - ľavá zátvorka pre otvorenie skupiny výrazov.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr "  )              - pravá zátvorka pre uzatvorenie skupiny výrazov.\n"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
@@ -1184,12 +1134,12 @@ msgstr ""
 "spätné volanie je :\n"
 "%s\n"
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "použitie špecifického prostredia na %s\n"
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1206,20 +1156,20 @@ msgstr ""
 "\n"
 "použitie:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - použiť zadaný synthesis súbor namiesto urpmi databázy.\n"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 "  --auto-select  - automatický výber balíkov pre aktualizáciu systému.\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
@@ -1228,7 +1178,7 @@ msgstr ""
 "  --no-uninstall - nikdy sa nepýtať na odinštalovanie balíka, ukončiť\n"
 "                   inštaláciu.\n"
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1238,7 +1188,7 @@ msgstr ""
 "požadované\n"
 "                   balíky ktoré môžu viesť k odstraňovaniu.\n"
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1249,38 +1199,38 @@ msgstr ""
 "                   alebo aktualizovaných viacero balíkov,\n"
 "                   štandardná hodnota je %d.\n"
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - malá veľkosť transakcií, štandardne je %d.\n"
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - fuzzy vyhľadávanie (to isté ako -y).\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 "  --src          - nasledujúci balík je zdrojový balík (to isté ako -s).\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - nainštalovať len zdrojový balík (bez bináriek).\n"
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - odstrániť nepoužité rpm súbory z dočasnej pamäti.\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - ponechať nepoužité rpm súbory v dočasnej pamäti.\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1290,7 +1240,7 @@ msgstr ""
 "bez\n"
 "                   overovania závislosti.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1300,7 +1250,7 @@ msgstr ""
 "bez\n"
 "                   overovania závislosti a integrity.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1310,22 +1260,22 @@ msgstr ""
 "vhodné\n"
 "                   pri inštalácii v chroot prostredí s prepínačom --root.\n"
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - použiť wget pre získanie vzdialených súborov.\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - použiť curl pre získanie vzdialených súborov.\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - obmedziť rýchlosť získavania súborov.\n"
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1335,7 +1285,7 @@ msgstr ""
 "                   (--no-resume zakáže takéto chovanie, štandardne je "
 "zakázané).\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1344,7 +1294,7 @@ msgstr ""
 "  --proxy        - použiť špecifikovanú HTTP proxy, číslo portu je\n"
 "                   štandardne 1080 (formát zápisu <proxy[:port]>).\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1353,7 +1303,7 @@ msgstr ""
 "  --proxy-user   - špecifikovanie používateľa a hesla pri použití proxy\n"
 "                   autentifikácie (formát je <používateľ:heslo>).\n"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1362,12 +1312,12 @@ msgstr ""
 "  --bug          - vytvoriť oznámenie o chybe do adresára uvedeného\n"
 "                   za argumentom.\n"
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - použiť X rozhranie.\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1376,7 +1326,7 @@ msgstr ""
 "  --best-output  - vyberie sa najlepšie rozhranie pre aktuálne prostredie:\n"
 "                   X alebo textový mód.\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1386,77 +1336,66 @@ msgstr ""
 "rpm\n"
 "                   zakáže overovanie, štandardne sa podpis overuje).\n"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 "  --excludepath  - cesty ktoré nemajú byť použité; viaceré je možné oddeliť\n"
 "                   čiarkou.\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - bez súborou s dokumentáciou.\n"
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - vyber všetky zhody na príkazovom riadku.\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - pre nájdenie balíka hľadať aj v poskytovaných.\n"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - pre nájdenie balíka nehľadať v poskytovaných.\n"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - fuzzy vyhľadávanie (to isté ako --fuzzy).\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 "  -s             - nasledujúci balík je zdrojový balík (to isté ako --src).\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - tichý mód.\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 "  mená alebo rpm súbory uvedené na príkazovom riadku budú nainštalované.\n"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr "Vyberte umiestnenie pre uloženie súboru"
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "nesprávna deklarácia proxy v príkazovom riadku\n"
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: neznáma voľba \"-%s\", použitie zistíte s --help\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr "Čo môže byť vykonané s binárnymi rpm súbormy pri použití --install-src"
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1479,22 +1418,22 @@ msgstr ""
 "\n"
 "Čo si želáte spraviť?"
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "Nič nevykonať"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr "Áno, naozaj inštalovať"
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr "Uložiť súbor"
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1509,12 +1448,12 @@ msgstr ""
 "\n"
 "Mali by ste preferovať jeho uloženie. Aký je váš výber?"
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, c-format
 msgid "Install it"
 msgstr "Nainštalovať"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1523,42 +1462,42 @@ msgstr ""
 "Adresár [%s] už existuje, použite prosím iný adresár pre hlásenie o chybe, "
 "alebo ho vymažte"
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Nemôžem vytvoriť adresár [%s] pre ohlásenie chyby"
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Inštalovať balíky má dovolené len superužívateľ"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "Jeden z nasledujúcich balíkov je potrebné nainštalovať %s:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Jeden z nasledujúcich balíkov je potrebný:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Váš výber? (1-%d) "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "Inštalácia balíkov..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "Inicializácia..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1567,12 +1506,12 @@ msgstr ""
 "Niektoré požadované balíky nie je možné nainštalovať:\n"
 "%s"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr "súhlasíte ?"
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1583,7 +1522,7 @@ msgstr ""
 "odstránené aby mohli byť iné aktualizované:\n"
 "%s\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1592,16 +1531,16 @@ msgstr ""
 "Nasledovné balíky by mali byť odstránené aby bolo možné aktualizovať iné:\n"
 "%s"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
 "Kvôli zachovaniu závislostí, by mali byť nainštalované nasledujúce balíky (%"
 "d MB)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1610,39 +1549,49 @@ msgstr ""
 "Musíte byť root ak chcete nainštalovať tieto aktualizácie:\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "nie je možné získať zdrojové balíky, prerušenie"
 
 # **************fix me****************
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Prosím vložte médium \"%s\" do zariadenia [%s]"
 
 # ******************fix me***********
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Stlačte Enter..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Získavanie balíka `%s'..."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% z %s hotové, zostáva = %s, rýchlosť = %s"
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% hotové, rýchlosť = %s"
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Nasledujúce balíky obsahujú zle signatúry"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Chcete pokračovať v inštalácii ?"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1653,57 +1602,57 @@ msgstr ""
 "%s\n"
 "Možno budete chcieť aktualizovať Vašu urpmi databázu"
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "Inštalácia zlyhala"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr "distribuovanie %s"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr "inštalácia %s"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Inštalácia balíka `%s' (%s/%s)..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Skúsiť inštaláciu bez kontroly závislostí? (á/N) "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Skúsiť \"tvrdšiu\" inštaláciu (--force)? (á/N) "
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d inštalačná transakcia zlyhala"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "Inštalácia je možná"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "Všetko je už nainštalované"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr "znovuspustenie urpmi"
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1728,29 +1677,29 @@ msgstr ""
 "\n"
 "a [voľby] sú\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - vytvoriť aktualizačný zdroj.\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr "  --probe-synthesis - pokúsiť sa nájsť a použiť synthesis súbor.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr "  --probe-hdlist - pokúsiť sa nájsť a použiť hdlist súbor.\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
 "                   hdlist file.\n"
 msgstr "  --no-probe     - neskúšať hľadať synthesis alebo hdlist súbor.\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -1759,7 +1708,7 @@ msgstr ""
 "  --distrib      - automaticky vytvoriť všetky zdroje z inštalačného\n"
 "                   zdroja.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1770,7 +1719,7 @@ msgstr ""
 "                   distribúcie, XXX môže byť main, contrib, updates alebo\n"
 "                   čokoľvek iné čo už bolo vytvorené ;-)\n"
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1779,7 +1728,7 @@ msgstr ""
 "  --from         - použiť zadanú url pre zoznam mirrorov, štandardne je to\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1790,7 +1739,7 @@ msgstr ""
 "                   získavaná verzia distribúcie z nainštalovaného balíka\n"
 "                   mandrake-release.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
@@ -1800,7 +1749,7 @@ msgstr ""
 "architektúra\n"
 "                   z nainštalovaného balíčka mandrake-release.\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
@@ -1809,73 +1758,52 @@ msgstr ""
 "  --virtual      - vytvorenie virtuálneho zdroja, ktorý je vždy aktuálny,\n"
 "                   povolený je iba file:// protokol.\n"
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - zakázať MD5SUM kontrolu.\n"
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - zmazať hlavičky v adresári dočasnej pamäte.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - vnúť generovanie hdlist súborov.\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"neznáma voľba '%s'\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "nieje možné pridať aktualizáciu cooker distribúcie\n"
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "sťahovanie mirrorov z %s ..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"nie je potrebné zadať <relatívnu cesta k hdlist> s --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "nie je potrebné zadať <relatívnu cesta k hdlist> s --distrib"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "nemôžem aktualizovať zdroj \"%s\"\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"chýba <relatívna cesta k hdlist>\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "chýba <relatívna cesta k hdlist>\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"chýbajúce `with' pre sieťový zdroj\n"
+msgid "`with' missing for network media\n"
+msgstr "chýbajúce `with' pre sieťový zdroj\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "nieje možné vytvoriť zdroj \"%s\"\n"
@@ -1894,6 +1822,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - vybrať všetky zdroje.\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"neznáma voľba '%s'\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1908,7 +1845,7 @@ msgstr ""
 "chýba položka pre odstránenie\n"
 "(jedna z %s)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1917,27 +1854,27 @@ msgstr ""
 "použitie: urpmi.update [voľby] <meno> ...\n"
 "kde <meno> je zdroj pre aktualizáciu.\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - použiť len aktualizačné zdroje.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr "  --force-key    - vynútiť aktualizáciu gpg kľúča.\n"
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - vybrať všetky nevymeniteľné zdroje.\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "nie je čo aktualizovať (použi urpmi.addmedia na pridanie zdroja)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1946,7 +1883,7 @@ msgstr ""
 "chýba položka pre aktualizáciu\n"
 "(jeden z %s)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1963,22 +1900,22 @@ msgstr ""
 "\n"
 "použitie:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - vypísať všetky dostupné balíky.\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - vypísať dostupné zdroje.\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-media   - vypísať dostupné zdroje a ich url.\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
@@ -1986,17 +1923,17 @@ msgstr ""
 "  --dump-config  - exportovať konfiguráciu v tvare argumentu pre urpmi."
 "addmedia.\n"
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr "  --list-nodes   - vypísať dostupné uzly pre --parallel.\n"
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - vypísať dostupné paralelné aliasy.\n"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
@@ -2006,7 +1943,7 @@ msgstr ""
 "na\n"
 "                   stdout (iba root).\n"
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
@@ -2014,7 +1951,7 @@ msgstr ""
 "  --sources      - získať všetky zdrojové balíky pred sťahovaním (iba "
 "root).\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
@@ -2023,17 +1960,17 @@ msgstr ""
 "  --use-distrib  - nastaviť urpmi pre používanie distribučného zdroja.\n"
 "                   To umožňuje zadávať dotazy na distribúciu.\n"
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - zobraziť históriu zmien.\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - rozšíriť dotaz o závislosti pre balík.\n"
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -2041,52 +1978,106 @@ msgid ""
 msgstr ""
 "  -u             - odstrániť balík ak už je nainštalovaná novšia verzia.\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - kompletný výstup s balíkmi na odstránenie.\n"
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - reverzné hľadanie čo balík potrebuje.\n"
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -i             - vypísať užitočné informácie v čitateľnom formáte.\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - vypísať skupiny aj s menami.\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - vypísať verziu a release s menom.\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - zoznam súborov v balíku.\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  mená alebo rpm súbory zadané na príkazovom riadku budú dotazované.\n"
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: neznáma voľba \"-%s\", použitie zistíte s --help\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: nieje možné prečítať súbor \"%s\"\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes nemôže byť použité len s --parallel"
+
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "Neznámy program na získavanie súborov `%s' !!!\n"
+
+#~ msgid "copy failed: %s"
+#~ msgstr "kopírovanie zlyhalo: %s"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "chýba wget\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "wget neúspešný: skončil s %d alebo signálom %d\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "chýba curl\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "curl neúspešné: ukončené s %d alebo signálom %d\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "chýba rsync\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "rsync neúspešný: ukončené s %d alebo signálom %d\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "chýbajúce ssh\n"
+
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpme: neznáma voľba \"-%s\", použitie zistíte s --help\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmi: neznáma voľba \"-%s\", použitie zistíte s --help\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr ""
+#~ "Kvôli zachovaniu závislostí, by mali byť nainštalované nasledujúce balíky "
+#~ "(%d MB)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "nie je potrebné zadať <relatívnu cesta k hdlist> s --distrib"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "chýba <relatívna cesta k hdlist>\n"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "chýbajúce `with' pre sieťový zdroj\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmq: neznáma voľba \"-%s\", použitie zistíte s --help\n"
diff --git a/po/sl.po b/po/sl.po
index 49ce49ef..02ea092b 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-sl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2004-03-29 14:10+0200\n"
 "Last-Translator: Tadej Panjtar <panjtar@email.si>\n"
 "Language-Team: slovenian <sl@li.org>\n"
@@ -54,22 +54,22 @@ msgstr ""
 "Samodejno nameščanje paketov\n"
 "Vi ste zahtevali namestitev paketa %s\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "Je to v redu?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "V redu"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Prekliči"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr "(D/n)"
@@ -79,7 +79,7 @@ msgstr "(D/n)"
 msgid "%s: command not found\n"
 msgstr "%s: ukaz ni najden\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
@@ -88,116 +88,55 @@ msgstr ""
 "uporaba: %s [možnosti]\n"
 "kjer so [možnosti] med\n"
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - prikaže to sporočilo s pomočjo.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "   -g [group]     - omeji rezultate za podano skupino.\n"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, c-format
 msgid "                    defaults is %s.\n"
 msgstr "                    prevzeto je %s.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Neznano spletno prenašanje `%s' !!!\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "neznan definiran protokol za %s"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "ni programa za spletno pridobivanje, podprti so: %s\n"
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "nemogoče obravnavati protokol: %s"
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "spodletelo kopiranje %s"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "wget je pograšan (ni nameščen na sistemu)\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget je neuspel: končal se je z %d ali signalom %d\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "curl je pograšan ni (nameščen na sistemu)\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl je neuspel: končal se je z %d ali signalom %d\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "rsync je pograšan (ni nameščen na sistemu)\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "rsyns je neuspel: končal se je z %d ali signalom %d\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "ssh je pograšan (ni nameščen na sistemu)\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% od %s končano ETA= %s, hitrost= %s"
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% končano, hitrost = %s"
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...pridobivanje je spodletelo: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "sintaktična napaka v nastavitveni datoteki v vrstici %s"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 "medij \"%s\" poskuša uporabiti že uporabljen seznam hdlist, medij je zato "
 "prezrt"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 "medij \"%s\" poskuša uporabiti že uporabljen seznam, medij je zato prezrt"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -206,40 +145,40 @@ msgstr ""
 "nemogoče je poskrbeti za medij  \"%s\" , ker je ta seznam že uporabljen pri "
 "drugem mediju"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 "nemogoče je uporabiti ime \"%s\" za neimenovan medij, ker je to že "
 "uporabljeno"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 "nemogoče je vzeti medij \"%s\" v račun, ker ne obstaja seznam datotek [%s] "
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "nemogoče je določiti medija te hdlist datoteke [%s]"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "nemogoče je dostopati do datoteka hdlist \"%s\", medij je zato prezrt"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "nemogoče je dostopati do seznama datotek \"%s\", medij je zato prezrt"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "poskušam preiti obstoječi medij, izogibanje \"%s\""
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -248,92 +187,92 @@ msgstr ""
 "navidezni medij \"%s\" ne sme imeti uporabljen seznam hdlist, medij je zato "
 "prezrt"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "navidezni medij \"%s\" mora imeti čisti url, medij je zato prezrt"
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "nemogoče je najti hdlist datoteke \"%s\", medij je zato prezrt"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "nemogoče je najti seznam datotek \"%s\", medij je zato prezrt"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "neurejen seznam datotek za \"%s\", medij je zato prezrt"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "nemogoče je pregledati seznam datotek za \"%s\", medij je zato prezrt"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "preveč priklopnih točk za izmenljivi medij \"%s\""
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "izmenljivo napravo vzamem kot \"%s\""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "uporabljam drugačno izmenljivo napravo [%s] za \"%s\""
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "nemogoče je razrešiti pot za izmenljivi medij \"%s\""
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "nemogoče je pisanje nastavitvene datoteke [%s]"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "pišem datoteko z nastavitvami [%s]"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "Ne morem uporabiti vzporednega načina z začinom use-distrib"
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "nemogoče je razčleniti \"%s\" v datoteki [%s]"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "preverjam vzporednega upravljača v datoteki [%s]"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "najden je vzporedni upravljač za vozlišča: %s"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "uporabljam združen medij za vzporeden način: %s"
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "nemogoče je uporabiti vzporedno izbiro \"%s\""
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -342,90 +281,90 @@ msgstr ""
 "--synthesis ne more biti uporabljen z --media, --excludemedia, --sortmedia, "
 "--update or --parallel"
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "preverjam synthesis datoteko [%s]"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "preverjam hdlist datoteko [%s]"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "nevidezni medij \"%s\" ni lokalen, medij je zato prezrt"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "problem pri branju synthesis datoteke medija: \"%s\""
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "izvajam drugi prehod za izračun odvisnosti\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "izpuščam paket %s"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "želiš namestiti namesto nadgraditi paket %s"
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "nemogoče odpreti rpmdb"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "medij \"%s\" že obstaja"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr "navidezni medij mora biti področen"
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "dodan medij %s"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "nemogoče je dostopati do prvega namestitvenega madija"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "kopiranje hdlists datoteke..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "...kopiranje je spodletelo"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "...kopiranje končano"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
@@ -434,43 +373,49 @@ msgstr ""
 "nemogoče je dostopati do prvega namestitvenega medija (ni datoteke Mandrake/"
 "base/hdlists )"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "prinašanje hdlists datoteke..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "...pridobivanje je končano"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...pridobivanje je spodletelo: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "napačen opis hdlist \"%s\" v datoteki hdlists"
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "poskušal sem izbrati neobstajajoči medij \"%s\""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "izbiranje več medijev: %s"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "odstranjevanje medij \"%s\""
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -481,7 +426,7 @@ msgstr ""
 "to se lahko zgodi, če je tvoj medij ročno priklopljen v imenik ko se medij "
 "kreira."
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -490,222 +435,222 @@ msgstr ""
 "navidezni medij \"%s\" mora imeti veljaven izvor hdlist ačo symtjesos, medij "
 "je zato prezrt"
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "kopiranje datoteke z opisi \"%s\"..."
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "računanje md5sum obstoječega izvora hdlist (ali synthesis)"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "preverjanje MD5SUM datoteke"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "kopiranje izvora (datoteke hdlist ali synthesis) od \"%s\"..."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "kopiranje [%s] je spodletelo (datoteke je sumljivo majhna)"
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "računanje md3sum kopiranega izvora datoteke hdlist (ali synthesis) "
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "spodletelo je kopiranje [%s] (md5sum se ne ujema)"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "problem pri branju synthesis datoteke z medija \"%s\""
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "branje rpm datotek iz [%s]"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "nemogoče je branje rpm datotek iz [%s]: %s"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "ni najdenih nič rpm datotek z [%s]"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "prinašanje izvora (datoteke hdlist ali synthesis) kot \"%s\"..."
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "najden prevjerjen seznam (datoteke hdlist ali synthesis) kot %s"
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "računanje md5sum izvorne datoteke hdlist ( ali synthesis)"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr "md5sum se ne ujema"
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "prinašanje izvora je spodletelo (datoteke hdlist ali synthesis)"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "nisem našel hdlist zbirke za medij \"%s\""
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "datoteka [%s] je že uporabljena v istam mediju \"%s\""
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "nemogoče je razčleniti hdlist medija \"%s\""
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "nemogoče je zapisati seznam od \"%s\""
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "pišem datoteko s seznamom za medij \"%s\""
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "nč ni napisano v datoteki s seznamom za \"%s\""
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "preverjanje datoteko z javnimi ključi od \"%s\"..."
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...uvožen je ključ %s iz datoteke javnih ključev od \"%s\""
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "nemogoče je uvoziti javni ključ od \"%s\""
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "berem zglavja iz medija \"%s\""
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "gradim hdlist [%s]"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "zgrajen je hdlist synthesis za medij \"%s\""
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "najdenih je %d zglavij v medpomnilniku"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "odstranjujem %d zastarelih zglavij v medpomnilniku"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "priklaplam %s"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "odklapljam %s"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "najdenih je %s vnosov v seznamu depslist"
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "ni vnosov v seznamu depslist"
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "napačno ime rpm datoteke [%s]"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "prinašam rpm datoteko [%s] ..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "nemogoče je dostopati do rpm datoteke [%s]"
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "nemogoče je registrirati rpm datoteko"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "napaka pri registraciji lokalnih paketov"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "ni paketa poimenovanega %s"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Sledeči paketi vsebujejo %s: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "tu je več paketov z istim imenom rpm datoteke \"%s\""
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "nemogoče je pravilno razčleniti [%s] pri vrednosti \"%s\""
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -714,144 +659,159 @@ msgstr ""
 "medij \"%s\" uporablja neveljaven seznam datotek \n"
 "  zrcalno mesto verjetno ni najbolj sodobno, poskušam uporabiti druge načine"
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "medij \"%s\" ne beleži kako lokacijo rpm datotek"
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "ni najden paket %s"
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "podatkovna baza urpmi je zaklenjena"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "medij \"%s\" ni označen"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "nemogoče je brati rpm datoteko [%s] iz medija \"%s\""
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "neurejen medij \"%s\" je označen kot izmenljivi, a ne drži"
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "nemogoče je dostopati do medija \"%s\""
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "spačen vhod: [%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "pridobivanje rpm datotek iz medija \"%s\"..."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "Pripravljam..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "uporabljam proces %d za izvajanje transakcije"
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 "narejena transakcija za nameščanje %s (odstrani=%d, namesti=%d, posodobi=%d)"
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr "nemogoče je narediti transakcijo"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "odstranjevanje paketa %s"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "nemogoče odstraniti paket %s"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "dodajanje paketa %s (id=%d, eid=%d, posodobi=%d, datoteka=%s)"
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "nemogoče namestiti paket  %s"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "glede na manjkajoče %s"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "zaradi nezadovoljstva %s"
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr "poskušam posodobiti %s"
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr "glede na ohranitev %s"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "glede na namestitev %s"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "glede na konflikte z/s %s"
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr "nezahtevan"
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Neveljaven podpis (%s)"
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "Neveljaven ID ključa (%s)"
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Pogrešan je podpis (%s)"
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "napačna napoved posrednika v ukazni vrstici\n"
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: ne morem brati rpm datoteke \"%s\"\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Oprostite, slaba izbira, poskusi znova\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -868,42 +828,42 @@ msgstr ""
 "\n"
 "uporaba:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - prikaže to sporočilo s pomočjo.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - avtomatsko izbere paket v možnostih.\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 "  --test         - preveri, če je lahko namestitev pravilno dosežena.\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 "  --force        - prisili v dejanje celo če nekateri paketi ne obstajajo.\n"
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - porazdeljen urpmi po napravah z vzdevki.\n"
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - uporabi drug korenski imenik za rpm namestitev.\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -913,72 +873,62 @@ msgstr ""
 "je\n"
 "                   za namestitev ali odstranitev z možnostjo --root .\n"
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - zgovoren način.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - izberi vse pakete ki ustrezajo izrazu.\n"
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: nepoznana opcija \"-%s\", preveri uporabo z --help\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr "neznani paketi"
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "neznan paket"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "odstranitev paketa %s bo zrušilo tvoj sistem"
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr "Ničesr za odstraniti"
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "Preverjam za odstranitev sledečih paketov"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr "Zaradi odvisnosti bodo odstranjeni sledeči paketi (%d MB)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (d/N) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "odstranijevanje %s"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr "Odstranjevanje je spodletelo "
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Oprostite, slaba izbira, poskusi znova\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -995,39 +945,39 @@ msgstr ""
 "\n"
 "uporaba:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - uporabi samo medij za posodobitev.\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - uporabi samo podane medije, ločene z vejico.\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - ne uporabi podane medije, ločene z vejico.\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 "  --sortmedia    - medije razvrsti glede na podnize, ločene z vejico.\n"
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr "  --synthesis    - uporabi tale dan synthesis namesti urpmi baze.\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - zgovorni način.\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1038,89 +988,89 @@ msgstr ""
 "opravilav ukazni\n"
 "                   vrstici, nezdružljivo z interaktivnim načinom).\n"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --uniq         - ne izpiši identičnih vrstic.\n"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all          - izpiši vse oznake.\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group        - izpiše oznako skupine: skupina.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size         - izpiše oznako velikosti: velikost.\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --epoch        - izpiše oznako epoch: epoch.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary      - izpiše oznako povzetka: povzetek.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description  - izpiše oznako opisa: opis.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr "  --sourcerpm    - izpiše oznako sourcerpm: izvorni rpe.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr "  --packager     - izpiše oznako packager: kdo je naredil paket.\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr ""
 "  --buildhost    - izpiše oznako buildhost: strežnik, kjer je bil paket "
 "zgrajen.\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --url          - izpiše oznako url: url.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr "  --provides     - izpiše oznako provides: vse provides.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr "  --requires     - izpiše oznako requires: vse requires.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files        - izpiše oznako datoteke: vse datoteke.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr "  --conflicts    - izpiše oznako konfliktov: vse konflikte.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr "  --obsoletes    - izpiše oznako obsoletes: vse obsoletes.\n"
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
@@ -1129,24 +1079,24 @@ msgstr ""
 "  --env          - uporabi specifično okolje (tipično poročilo\n"
 "                   o napaki).\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
 "  -i             - ignoriraj razlike malih/velikih črk v vsakem vzorcu.\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - izpiši različico, izdajo in arhitekturo z vsakim imenom.\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - vključi perl kodo direktno kot perl -e.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
@@ -1154,29 +1104,29 @@ msgstr ""
 "  -a             - binarni IN operator, pravilen če sta pravilna oba "
 "izraza.\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 "  -o             - binarni ALI operator, pravilen če je en izraz pravilen.\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - NOT operator, pravilen če je izraz napačen.\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr "  (              - levi oklepaj za odpiranje skupine izrazov.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr "  )              - desni oklepaj za zapiranje skupine izrazov.\n"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
@@ -1185,12 +1135,12 @@ msgstr ""
 "klic nazaj je :\n"
 "%s\n"
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "uporabljam specifično okolje pri %s\n"
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1207,18 +1157,18 @@ msgstr ""
 "\n"
 "uporaba:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - uporabi tale dan synthesis namesti urpmi baze.\n"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - avtomatsko izberi pakete za posodobitev sistema.\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
@@ -1227,7 +1177,7 @@ msgstr ""
 "  --no-uninstall - nikoli ne vprašaj za odstranitev paketa,  prekini takrat "
 "namestitev.\n"
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1236,7 +1186,7 @@ msgstr ""
 "  --keep         - če je mogoče ohrani obstoje pakete, zavrni zahtevane\n"
 "                   pakete ki vodijo v odstranjevanje.\n"
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1247,39 +1197,39 @@ msgstr ""
 "                   namestiti ali nadgaraditi več paketov, kot je podano;\n"
 "                   privzeto je %d.\n"
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - majhna velikost transakcij, privzeto je %d.\n"
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - vsili ohlapno iskanje (isto kot -y).\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - naslednji paket je izvorni paket (isto kot -s).\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - namesti samo izvorni paket (ne binarnih).\n"
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 "  --clean        - odstrani pred drugim dejanjem rpm pakete iz "
 "medpomnilnika.\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - hrani neuporabljane rpm pakete v medpomniliku.\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1288,7 +1238,7 @@ msgstr ""
 "  --allow-nodeps - dovoli si vprašati uporabnika za namestitev paketov brez\n"
 "                   preverjanja odvisnosti.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1298,7 +1248,7 @@ msgstr ""
 "brez \n"
 "                   preverjanja odvisnosti in integritete.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1308,22 +1258,22 @@ msgstr ""
 "je\n"
 "                   za namestitev chroot z možnostjo --root .\n"
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - uporabi wget za pobiranje datotek.\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - uporabi curl za pobiranje datotek.\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - omeji hitrost pobiranja.\n"
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1332,7 +1282,7 @@ msgstr ""
 "  --resume       - nadaljuje prenos delno pobranih datotek\n"
 "                   (--no-resume onemogoča to, privzeto je onemogočeno).\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1341,7 +1291,7 @@ msgstr ""
 "  --proxy        - upodabi določen HTTP posrednik, vtičnik je domnevno\n"
 "                       privzeto 1080 (format je <posrednik[:vtičnik]>).\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1350,7 +1300,7 @@ msgstr ""
 "  --proxy-user   - določi uporabnika in geslo za uporabo avtentifikacije\n"
 "                   pri posredniku (formatje <uporabnik:geslo>).\n"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1359,12 +1309,12 @@ msgstr ""
 "  --bug          - pripravi poročilo o napaki v imenik prikazanem z\n"
 "                   naslednjim argumentom.\n"
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - uporabi X vmestnik\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1373,7 +1323,7 @@ msgstr ""
 "  --best-output  - izbere najboljši vmestnik glede na okolje:\n"
 "                   X ali tekstni način.\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1382,74 +1332,63 @@ msgstr ""
 "  --verify-rpm   - preveri rpm podpis pred namestitvijo\n"
 "                   (--no-verify-rpm onemogoči, privzeto omogočen).\n"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - izloči poti ločene z vejico.\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - izkljiči datoteke z dokumentacijo.\n"
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - izberi vsa ujemanja v ukazni vrstici.\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - dovoli iskanje v polje provides da najde paket.\n"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - ne išči v polje provides da najde paket.\n"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - vsili ohlapno iskanje (isto kot --fuzzy).\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 "  -s             - naslednji paket je izvorni paket (isto kot --src).\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - tihi način.\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  imena ali rpm datoteke podane iz ukazne vrstice bodo nameščene.\n"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr "Izberi mesto za shranjevanje datoteke"
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "napačna napoved posrednika v ukazni vrstici\n"
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: neznana opcija \"-%s\", preveri uporabo z --help\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr "Kaj je lahko narejeno z binarno rpm datoteko pri uporabi --install-src"
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1470,22 +1409,22 @@ msgstr ""
 "\n"
 "Kaj bi želeli narediti?"
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "Ne naredi nič"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr "Da, res namesti"
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr "Shrani datoteko"
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1500,12 +1439,12 @@ msgstr ""
 "\n"
 "Mogoče bi ga raje samo shranili. Kakšna je vaša izbira?"
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, c-format
 msgid "Install it"
 msgstr "Namestitev"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1514,42 +1453,42 @@ msgstr ""
 "Imenik %s] že obstaja, prosim vas da uporabite drugega za poročilo o napaki "
 "ali pa ga izbrišite"
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Nemogoče je kreirati imenik [%s] za poročilo o napaki"
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Samo superuporabniku je dovoljeno nameščati pakete"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "Za namestitev je potreben en od sledečih paketov %s:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Potreben je en od sledečih paketov:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Kakšna je tvoja izbira? (1-%d) "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "Namestitev paketa..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "Pripravljanje..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1558,12 +1497,12 @@ msgstr ""
 "Nekateri zahtevani paketi ne morejo biti nameščeni:\n"
 "%s"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr "ali se strinjate ?"
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1574,7 +1513,7 @@ msgstr ""
 "odstraniti, da bodo drugi posodobljeni:\n"
 "%s\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1583,14 +1522,14 @@ msgstr ""
 "Sledeči paketi morajo biti odstranjeni zaradi posodabljanj z novejšimi :\n"
 "%s"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr "Za zadovolitev odvisnosti nameravam namestiti naslednje pakete (%d MB)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1599,37 +1538,47 @@ msgstr ""
 "Moraš biti prijavljen kot root za namestitev sledečih odvisti:\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "nemogoče je dobiti izvorne pakete, preklic"
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Prosim vstavi medij poimenovan \"%s\" v napravo [%s]"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Pritisni Enter ko boš pripravljen..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Pobiranje paketa`%s'..."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% od %s končano ETA= %s, hitrost= %s"
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% končano, hitrost = %s"
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Sledeči paketi imajo slabe podpise"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Ali želite nadaljevati namestitev ?"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1640,57 +1589,57 @@ msgstr ""
 "%s\n"
 "Podatkovno bazo urpmi lahko obnovite"
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "Neuspela namestitev"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr "dostavljanje %s"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr "nameščam %s"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Nameščam paket `%s' (%s/%s)..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Poizkusi z namestitvijo brez preverjan odvisnosti? (d/N) "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Poizkusi s strogo namestitvijo (--force)? (d/N) "
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d namestitvena transakcija je spodletela"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "Namestitev je mogoča"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "Vse je že nameščeno"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr "ponovno zaganjam urpmi"
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1715,22 +1664,22 @@ msgstr ""
 "\n"
 "in so [opcije] iz\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - kreiraj medij za posodabljanje.\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr "  --probe-synthesis - poskusi najti in uporabiti synthesis datoteko.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr "  --probe-hdlist - poizkusi najti in uporabiti hdlist datoteko.\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
@@ -1739,7 +1688,7 @@ msgstr ""
 "  --no-probe             - ne poskusi najti synthesis ali hdlist\n"
 "                   datoteki.\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -1748,7 +1697,7 @@ msgstr ""
 "  --distrib      - avtomatsko kreiraj vse medije iz namestitvenega\n"
 "                   medija.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1760,7 +1709,7 @@ msgstr ""
 "posodobitve ali\n"
 "                   karkoli drugega, kar je bilo pripravljeno ;-)\n"
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1770,7 +1719,7 @@ msgstr ""
 "privzeto je\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1781,7 +1730,7 @@ msgstr ""
 "                   iz različice distribucije dobljene pri namestitvi\n"
 "                   paketa mandrake-release.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
@@ -1791,7 +1740,7 @@ msgstr ""
 "vzame\n"
 "                   tista, ki jo ima nameščen paket mandrake-release .\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
@@ -1800,74 +1749,53 @@ msgstr ""
 "  --virtual      - kreiraj navidezni medij, ki je vedno posodabljan,\n"
 "                   samo file:// protokol je dovoljeno.\n"
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 "  --md5sum-ne-obstaja    - preverjanje datoteke z MD5SUM onemogočeno.\n"
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - počisti imenik z medpomnilnikom zglavij.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - prisili tvorbo hdlist datotek.\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"nepoznane opcije '%s'\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "ne morem dodati distribucije s posodobitvami ali cooker\n"
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "prinašam zrcalna mesta pri %s ..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"ni potrebe dajati <relativna pot do hdlist> z --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "ni potrebe dajati <relativna pot do hdlist> z --distrib"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "nemogoče je posodobiti medij \"%s\"\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"<relativna pot do hdlist> je pogrešanja\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<relativna pot do hdlist> je pogrešanja\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"`with' manjka za mrežni medij\n"
+msgid "`with' missing for network media\n"
+msgstr "`with' manjka za mrežni medij\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "nemogoče je kreirati medij \"%s\"\n"
@@ -1886,6 +1814,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - izberi celoten medij.\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"nepoznane opcije '%s'\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1900,7 +1837,7 @@ msgstr ""
 "pogrešan je vnos za odstranitev \n"
 "(en od %s)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1909,28 +1846,28 @@ msgstr ""
 "uporaba: urpmi.update [opcije] <ime> ...\n"
 "kjer je <ime> ime medija za posodabljanje.\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - posodobi samo posodobitveni medij.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr "  --force-key    -prisili posodobitev ključa gpg.\n"
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 "  -a             - izberi vse ne-izmenljive medije (niso na CD-ROM-ih).\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "nič ni za posodobit (uporabi urpmi.addmedia da dodaš nov medij)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1939,7 +1876,7 @@ msgstr ""
 "pogrešan je vnos za posodobitev\n"
 "(eden od %s)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1956,38 +1893,38 @@ msgstr ""
 "\n"
 "uporaba:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - listaj pakete na voljo.\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - listaj medije na voljo.\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-media   - listaj medije na voljo in njihovega url.\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr "  --dump-config  - izvrži nastavitve v formatu za urpmi.addmedia.\n"
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr "  --list-nodes   - listaj vozlišča na voljo pri uporabi --parallel.\n"
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - listaj vzporedne vzdevke, ki so na voljo.\n"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
@@ -1996,14 +1933,14 @@ msgstr ""
 "  --headers      - razširi glave paketa listane iz urpmi baze na\n"
 "                   stdout (samo root).\n"
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 "  --sources      - daj vse izvorne pakete pred pobiranjem dol (samo root).\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
@@ -2012,70 +1949,123 @@ msgstr ""
 "  --use-distrib  - nastavi na licu mesta urpmi iz distrib drevesa.\n"
 "                   To dovoli za povpraševanje distribucije .\n"
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - izpiše zgodovino sprememb.\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - razširi poizvedbo na paketove odvisnosti.\n"
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr "  -u             - odstrani paket, če je novejši ženameščen.\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - izvedi nalogo z odstranitvojo poketov.\n"
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - iskanje po nazaj kar paket potrebuje.\n"
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 "  -i             - izpiše uporabne informacije v človeku umljivem zapisu.\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - izpiše skupine skupaj z imenom.\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - izpiše različica in izdajo skupaj z imenom.\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - listaj datoteke v paketi.\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  imena ali rpm datoteke podane preko ukazne vrstice so obdelane.\n"
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: nepoznana izbira \"-%s\", preveri uporabo z --help\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: ne morem brati rpm datoteke \"%s\"\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes je lahko uporabljeno samo z --parallel"
+
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "Neznano spletno prenašanje `%s' !!!\n"
+
+#~ msgid "copy failed: %s"
+#~ msgstr "spodletelo kopiranje %s"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "wget je pograšan (ni nameščen na sistemu)\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "wget je neuspel: končal se je z %d ali signalom %d\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "curl je pograšan ni (nameščen na sistemu)\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "curl je neuspel: končal se je z %d ali signalom %d\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "rsync je pograšan (ni nameščen na sistemu)\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "rsyns je neuspel: končal se je z %d ali signalom %d\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "ssh je pograšan (ni nameščen na sistemu)\n"
+
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpme: nepoznana opcija \"-%s\", preveri uporabo z --help\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmi: neznana opcija \"-%s\", preveri uporabo z --help\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr ""
+#~ "Za zadovolitev odvisnosti nameravam namestiti naslednje pakete (%d MB)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "ni potrebe dajati <relativna pot do hdlist> z --distrib"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "<relativna pot do hdlist> je pogrešanja\n"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "`with' manjka za mrežni medij\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpme: nepoznana izbira \"-%s\", preveri uporabo z --help\n"
diff --git a/po/sq.po b/po/sq.po
index 7a2ca14d..f58f7f43 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2002-12-04 23:55+0200\n"
 "Last-Translator: Naim Daka <naim70@freesurf.ch>\n"
 "Language-Team: Albanian <LL@li.org>\n"
@@ -47,22 +47,22 @@ msgstr ""
 "Instalim automatikë i pakove...\n"
 "Ju keni kërkuar instalimin e pakove %s\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "Është kjo në rregull?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Anulo"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (P/j) "
@@ -72,120 +72,59 @@ msgstr " (P/j) "
 msgid "%s: command not found\n"
 msgstr "%s: ky urdhër mungon\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "where [options] are from\n"
 msgstr ""
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - shtype këtë lajmë ndihmues.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, fuzzy, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "  --group         - çfaqe etiketën group: grupi.\n"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, fuzzy, c-format
 msgid "                    defaults is %s.\n"
 msgstr "  --list         - shpalosi pakotë lira.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Program i pa njoftur për riatdhezimin e faqeve web `%s' !!!\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "protokol i pa njoftur për përcaktimit e %s"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "i pa mundur përdorimi i protokolit: %s"
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "kopjimi dështoi: %s"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "wget nuk është i instaluar\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget dështoi: dalje me kodin %d ose me sinjalin %d\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "curl nuk është i instaluar\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl  dështoi: dalje me kodin %d ose me sinjalin %d\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "rsync mungon\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "rsync dështoi: dalje me kodin %d ose me sinjalin %d\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "ssh mungon\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% nga %s kompletuar, ETA = %s, shpejtësia = %s"
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% kompletuar, shpejtësia = %s"
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...rikuperimi dështoi: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "gabim i sintaksës në skedaren e konfigurimit në rreshtin %s"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr "burimi \"%s\" përpiqet të përdorë hdlist përdoruese, burim i injoruar"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr "burimi \"%s\" përpiqet ta përdorë listën përdoruese, burim i injoruar"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -194,41 +133,41 @@ msgstr ""
 "e pa mundur kujdesja e burimit \"%s\" lista e skedares përdoret nga një "
 "burim tjetër"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 "i pa mundur përdorimi i emrit \"%s\" për burim të pa emruar sepse ky emër "
 "është në përdorim e sipër"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 "e pa mundur marrja në përsipër e llogarisë \"%s\" sepse asnjë skedare e "
 "listë [%s] nuk ekziston"
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "i pa mundur caktimi i burimit të kësaj skedareje hdlist [%s]"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "e pa mundur hyrja në skedaren hdlist të \"%s\", burim i injoruar"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "e pa mundur hyrja në skedaren e listës të \"%s\", burim i injoruar"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "tentim në kalimin e një burimit ekzistues \"%s\", ndërprerje"
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -237,93 +176,93 @@ msgstr ""
 "burimi virtuel \"%s\" nuk duhet të posedoj hdlist të përcaktuar apo skedaren "
 "list, burim i injoruar"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr ""
 "burimi virtuel \"%s\" duhet të posedoj një url të qartë, burim i injoruar"
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "e pa mundur gjetja e skedarës hdlist të \"%s\", burim i injoruar"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "e pa mundur gjetja e skedares listës të \"%s\", burim i injoruar"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "skedare e listës së ngatërruar për \"%s\", burim i injoruar"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "i pa mundur konsultimi i skedares-list \"%s\", burim i injoruar"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "shumë pika montuese për burimin tërheqës \"%s\""
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "marrje e mjetit tërheqës si \"%s\""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "përdorime të ndryshme të mjeteve tërheqëse [%s] për \"%s\""
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "e pa mundur hyrja në shtegun e burimit tërheqës \"%s\""
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "i pa mundur shkrimi i skedares konfiguruese [%s]"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "shkruaja e skedares konfiguruese [%s]"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "analizimi i pa mundur i \"%s\" në skedaren [%s]"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "kontrollimi i përkrahjes në skedaren paralele [%s]"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "gjetja e përkrahjes në nyjet paralele: %s"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "përdorimi i burimit të lidhur për modë paralel: %s"
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "i pa mundur përdorimi i opcionit paralel \"%s\""
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -332,90 +271,90 @@ msgstr ""
 "--synthesis nuk mund të përdoret me --media, --excludemedia, --sortmedia, --"
 "update or --paralle"
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "kontrollimi i skedares sintezë [%s]"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "kontrollimi i skedares hdlist [%s]"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "burimi virtuel\"%s\" nuk është lokal, burim i injoruar"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "problem gjatë leximit të skedares hdlist po sintezë të burimit \"%s\""
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "ekzekutim i dytë për ti mbledhur mvarjet\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "kalimi i pakos %s"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "dëshiron ta instaloj në vend që t'azhurnoj pakon %s"
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "e pa mundur hapja e rpmdb"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "burimi \"%s\" ekziston me heret"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr "burimi virtuel duhet të jetë lokal"
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "shtuarja e burimit %s"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "hyrja e pa mundur në burimin e parë instalues"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "kopjimi i skedares hdlist..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "...kopjimi dështoi"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "...kopjimi i bërë"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
@@ -424,43 +363,49 @@ msgstr ""
 "hyrja e pa mundur në burimin e parë instalues (asnjë skedare e gjetur në "
 "Mandrake/base/hdlists)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "rikuperimi i skedares hdlist..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "...rikuperim i bërë"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...rikuperimi dështoi: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "përshkrimi \"%s\" i pa pranueshëm për skedaret hdlists"
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "tento zgjedhjen e një burimi jo ekzistues \"%s\""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "zgjedhje të shumta burimesh: %s"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "zhdukja e burimit \"%s\""
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -471,7 +416,7 @@ msgstr ""
 "kjo mund të ndodhë nëse ju e montoni manualisht repetorin kur e krijoni atë "
 "burim."
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -480,222 +425,222 @@ msgstr ""
 "burimi virtuel \"%s\" duhet të posedoj një burim hdlist apo sintezë, burim i "
 "injoruar"
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "kopjimi i skedares përshkruese të \"%s\"..."
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "llogaritja md5sum e burimit ekzistues në hdlist (ose sintezës)"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "kontrollim i skedares MD5SUM"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "kopjimi i burimit hdlist (ose sintezës) të \"%s\"..."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "llogaritja md5sum e kopjimit të burimit hdlist (ose sintezës)"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, fuzzy, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "kopjimi i [%s] dështoi"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "problem gjatë leximit të skedares sitezë të burimit \"%s\""
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "lexim i skedareve rpm nga [%s]"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "leximi i skedares rpm është i pa mundur nga [%s]: %s"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "asnjë skedare rpm e gjetur nga [%s]"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "rikuperim i burimit hdlist (ose sintezës) të \"%s\"..."
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "hdlista tesntuese është gjetur (ose sintezuar) sikur %s"
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "llogaritja md5sum e rikuperimit të burimit hdlist (ose sintezës)"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr "mos pajtim i md5sum"
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "rikuperimi i burimit hdlist (ose sintezës) dështoi"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "asnjë skedare e gjetur hdlist për burimin \"%s\""
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "skedarja [%s] është në përdorim nga i njëjti burim \"%s\""
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "analizimi i hdlist është i pa mundur të \"%s\""
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "shkruarja në skedaren list është e pa mundur për \"%s\""
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "shkruarja e skedares për listën e burimit \"%s\""
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "asgjë s'është shkruar në skedaren list \"%s\""
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "verifimi i skedares pubkey të \"%s\"..."
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...importimi i çelësit %s nga skedarja pubkey e \"%s\""
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "është e pa mundur importimi i skedares pubkey të \"%s\""
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "leximi i majës nga burimi \"%s\""
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "krijimi i hdlist [%s]"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "krijimi i skedares sintezë për burimin \"%s\""
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "gjetja e majës %d në fshehje"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "zhdukja e majave absolute %d në fshehje"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "montimi i %s"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "demontimi i %s"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "hyrjet %s zhvendosen në depslist"
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "asnjë hyrje e zhvendosur në depslist"
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "emri i skedares rpm është invalid [%s]"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "rikuperimi i skedareve rpm [%s]..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "e pa mundur hyrja në skedaren rpm [%s]"
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "i pa mundur regjistrimi i skedares rpm"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "gabim gjatë regjistrimit të pakove lokale"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "asnjë pako e emruar %s"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Pakot e radhitura përmbajnë %s: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "ekzistojnë pako të shumta me emër të njëjtë skedareje në rpm \"%s\""
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "nuk mund të analizohet në mënyrë korrekte [%s] në vlerën \"%s\""
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -704,64 +649,64 @@ msgstr ""
 "burimi \"%s\" përdore një listë skedaresh invalide:\n"
 " pasqyra nuk mund të azhurnohet, provoni ta përdorni metodën altenative"
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr ""
 "burimi \"%s\" nuk ka kurrëfar difinicioni për lokalizimin e skedareve rpm "
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "pakoja %s nuk është prezente"
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "baza e të dhënave urpmi është e mbyllur"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "burimi \"%s\" nuk është i zgjedhur"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "i pa mundur leximi i skedares [%s] nga burimi \"%s\""
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 "burim i ngatërruar \"%s\" është i shënuar si levizës, në të vërtet nuk është"
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "hyrje e pa mundur në burimin \"%s\""
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "hyrje e çformuarë: [%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "rikuperimi i skedareve rpm nga burimi\"%s\"..."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "Përgatitje..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "përdorimi i procesit %d për ekzekutimin e transakcionit"
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -769,82 +714,97 @@ msgstr ""
 "krijimi i një akcioni transmetues për një instalim në %s (remove=%d, install="
 "%d, upgrade=%d)"
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr "i pa mundur krijimi i një akcioni transmetues"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "zhdukja e pakos %s"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "e pa mundur zhdukja e pakos %s"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "shtimi i pakove %s (id=%d, eid=%d, update=%d, file=%s)"
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "i pa mundur instalimi i pakos %s"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "ka arritur nga mungesa %s"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "ka arritur gjatë mosmarrëveshjes %s"
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr "tentim në gradimin e %s"
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr "në urdhër për ta mbajturë %s"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "në urdhër për instalim %s"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "ka arritur gjatë konflikteve me %s"
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr "i pa kërkuar"
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Nënshkrim i pa pranueshëm (%s)"
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "Çelës invalid ID (%s)"
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Mungon nënshkrimi (%s)"
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "proxy që është deklaruar në linjën komanduese nuk është i saktë\n"
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: nuk mund ta lexojë skedaren rpm \"%s\"\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Kemi ndjesë, zgjedhje e gabuar, provoni edhe një herë\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -861,117 +821,107 @@ msgstr ""
 "\n"
 "përdorim:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - shtype këtë lajmë ndihmues.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 "  --auto         - zgjedhje automatike në njërën ndër pakot zgjedhëse.\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 "  --test        - verifikoje nëse instalimi përfundon në mënyrë korrekte.\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 "  --force        - kërkim i forcuar edhe pse disa pako nuk ekzistojnë.\n"
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 "  --parallel     - urmpi është i shpërndarë në pseudo makina të shumëta.\n"
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, fuzzy, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr ""
 "  --curl         - pëdore curl për rikuperimin e skedareve në distancë.\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - model oratori.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - zgjedhni të gjitha pakot me përshkrim të njëjtë.\n"
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: mundësi e pa njoftur \"-%s\", verifikoje përdorimin me --help\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr "pako të pa njoftura"
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "pako e pa njoftur"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "zhdukja a pakove %s do të dëmtoj sistemin tuaj"
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr "Mos zhduk asgjë"
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "Verifikimi i zhdukjes së pakove të radhitura"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr "Për ta plotësuar mvarësin, pakotë me radhë do të zhduken (%d MB)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (p/J)"
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "zhdukja e %s"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr "Zhdukja dështoi"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Kemi ndjesë, zgjedhje e gabuar, provoni edhe një herë\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -988,25 +938,25 @@ msgstr ""
 "\n"
 "përdorues:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - përdori vetëm burimet azhurnuese.\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 "  --media        - përdori vetëm burimet e dhëna, të ndara me presje.\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 "  --excludemedia        - mos i përdor vetëm burimet e dhëna, të ndara me "
 "presje.\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1014,19 +964,19 @@ msgstr ""
 "  --sortmedia        - radhitja e burimit akordohet me ndër-rreshtat e ndarë "
 "me presje.\n"
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - përdori skedaret e thëna sintezë në vend të bazës së të "
 "dhënave urpmi.\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - model oratori.\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1038,87 +988,87 @@ msgstr ""
 "                    në linjën komanduese, nuk përputhet me modin "
 "interaktiv).\n"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --uniq          - mos i çfaqë rreshtat e njëjtë.\n"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all           - çfaqi të gjitha etiketat.\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group         - çfaqe etiketën group: grupi.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size          - çfaqe etiketën size: madhësia.\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --epoch          - çfaqe etiketën epoch: epokë.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary        - çfaqe etiketën summary: përmbledhje.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description   - çfaqe etiketën description: përshkrimi.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr "  --sourcerpm     - çfaqe etiketën sourcerpm: burimi rpm.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr "  --packager      - çfaqe etiketën packager: paketues.\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr "  --buildhost    - çfaqe etiketën buildhost: ndërtoje ftuesin.\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --url        - çfaqe etiketën serial: url.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr "  --provides      - çfaqe etiketën provides: gjitha pajisjet.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr "  --requires      - çfaqe etiketën requires: gjitha dëshiratë.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files         - çfaqe etiketën files: gjitha skedaret.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr "  --conflicts     - çfaqe etiketën conflicts: gjitha konfliktet.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr "  --obsoletes     - çfaqe etiketën obsoletes: gjitha absolutisht.\n"
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
@@ -1127,23 +1077,23 @@ msgstr ""
 "  --env          - përdore mjedisin e veçantë (veçënarishtë një raport\n"
 "                   bug(i).\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr "  -i             - injoroje rastin e ndryshëm në gjdo model.\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - çfaqe versionin, hollësitë dhe arkitekturen me emër.\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - përfshije kodin perl direkt sikur perl -e.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
@@ -1151,7 +1101,7 @@ msgstr ""
 "  -a             - operues AND binar, saktësi nëse të dy shprehjet janë të "
 "sakta.\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
@@ -1159,24 +1109,24 @@ msgstr ""
 "  -o             - operues OR binar, saktësi nëse njëra nga shprehjet është "
 "e saktë.\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 "  -!             - njëjsi NOT, saktësi nëse shprehja është e pa vërtet.\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr "  (             - kllapë e majtë për ta hapur shprehjen e grupit.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
 "  )             - kllapë e djathtë për ta mbyllur shprehjen e grupit.\n"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
@@ -1185,12 +1135,12 @@ msgstr ""
 "thirrja e mbrapme është :\n"
 "%s\n"
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "përdorim specifik i mjedisit në %s\n"
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1207,19 +1157,19 @@ msgstr ""
 "\n"
 "përdorim:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - përdori skedaret e dhëna sintezë në vend të db.\n"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 "  --auto-select  - zgjedhni automatikisht pakot azhurnuese në sistem.\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
@@ -1228,7 +1178,7 @@ msgstr ""
 "  --no-uninstall - mos pyet kurr për dez-instalimin e pakos, abortoje "
 "instalimin.\n"
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1237,7 +1187,7 @@ msgstr ""
 "  --keep\t  - nëse ka mundësi i mbanë pakot prezente, refuzon pakot\n"
 "\t\t    e kërkuara me drejtim zhdukje.\n"
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1249,41 +1199,41 @@ msgstr ""
 "                   instalohet apo uzhurnohet,\n"
 "                   me marrëveshje është %d.\n"
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 "  --split-length - gjatësi e vogël e trans-akcionit, me marrëveshje është %"
 "d.\n"
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - shfrytëzoje hulumtimin e paqartë (njëjtë si -y).\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 "  --src          - pakoja me radhë është pako e burimit (njëjtë si -s).\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - instalo vetëm burimet e pakove (jo binare).\n"
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 "  --clean        - zhduki të gjithë rpm e fshehta para gjdo operacioni.\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - mbane rpm dhe mos e përdor në fshehje.\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1292,7 +1242,7 @@ msgstr ""
 "  --allow-nodeps - mundëson që përdoruesi në pytje të instaloj\n"
 "                   pakot pas i verifikuar mvarësit e tyre.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1301,31 +1251,31 @@ msgstr ""
 "  --allow-force  - mundëson që përdoruesi në pytje të instaloj\n"
 "                   pakot pas i verifikuar mvarësit dhe integritetin e tyre.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 "  --wget         - përdore wget për rikuperimin e skedareve në distancë.\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 "  --curl         - pëdore curl për rikuperimin e skedareve në distancë.\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - kyfizimi i shpëjtësisë së shkarkimit.\n"
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, fuzzy, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1334,7 +1284,7 @@ msgstr ""
 "  --verify-rpm   - verifikoje nënshkrimin e rpm para instalimit\n"
 "                   (--no-verify-rpm dezaktivizoje verifikim e tyre).\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1344,7 +1294,7 @@ msgstr ""
 "                   jetë 1080 në marrëveshje (forma është <proxyhost[:port]"
 ">).\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1354,7 +1304,7 @@ msgstr ""
 "proxy\n"
 "                   me vërtetim (forma është <user:password>).\n"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1363,12 +1313,12 @@ msgstr ""
 "  --bug          - dorëzoje një raport të bug(it) në repertorin e\n"
 "                   sugjeruar nga argumenti i dytë.\n"
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - përdore sipërfaqën ndarëse X.\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1377,7 +1327,7 @@ msgstr ""
 "  --best-output  - zgjedheni sipërfaqen më të mirë në funksion të\n"
 "                   mjedisit: X apo në modë teksti.\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1386,78 +1336,67 @@ msgstr ""
 "  --verify-rpm   - verifikoje nënshkrimin e rpm para instalimit\n"
 "                   (--no-verify-rpm dezaktivizoje verifikim e tyre).\n"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - përdori vetëm burimet e ndara me presje.\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - mos i prano skedaret doc.\n"
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 "  -a             - zgjedhni të gjitha korrespondencat në linjën komanduese.\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 "  -p             - lejon hulumtimet në pajisjetë për ta gjetur pakon.\n"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - mos hulumto në këto pajisje për ta gjetur pakon.\n"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 "  -y             - imponoje një hulumtim të paqartë (njëjtë si --fuzzy).\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 "  -s             - pakoja tjetër është një pako burimi (njëjtë si --src).\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - model i qetë.\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  emrat apo skedaret rpm në linjën komanduese do të instalohen.\n"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr ""
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "proxy që është deklaruar në linjën komanduese nuk është i saktë\n"
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: variant e pa njoftur \"-%s\", verifikoje përdorimin me --help\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 "Çfarë mund të bëhet me skedaret rpm binare nëse e përdorni --install-src"
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1470,22 +1409,22 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "Asnjë veprim"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr ""
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr ""
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1495,54 +1434,54 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, fuzzy, c-format
 msgid "Install it"
 msgstr "Instalimi dështio"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr ""
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "I pa mundur krijimi i repertorit [%s] për raport të bug(it)"
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Vetëm administratori i sistemin ka mundësi të instalojë pakot"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "Një nga pakot e radhitura duhet të instalohet %s:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Një nga pakot e radhitura nevojitet:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Cila është zgedhja e juaj? (1-%d) "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "Instalimi i pakos..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "Inicializimi..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1551,12 +1490,12 @@ msgstr ""
 "Disa nga pakot e kërkuara nuk mund të instalohen:\n"
 "%s"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr "a pajtoheni ?"
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1567,7 +1506,7 @@ msgstr ""
 "të zhduken që të tjerat të azhurnohen:\n"
 "%s\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1576,15 +1515,15 @@ msgstr ""
 "Pakot a radhitura duhet të zhduken që të tjerat të azhurnohen:\n"
 "%s"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
 "Për ti përmbushur mvarësit, pakot e radhitura duhet të instalohen (%d MB)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1593,37 +1532,47 @@ msgstr ""
 "Ju duhet të jeni administrator  për t'instaluar mvarësit e radhitura:\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "e pa mundur marrja e burimit të pakos, ndërpritje"
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Ju lutemi futni burimin e emruar \"%s\" në mjetin [%s]"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Shtypni mbi Enter kur jeni i gatshëm..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Shkarkimi i pakos `%s'..."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% nga %s kompletuar, ETA = %s, shpejtësia = %s"
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% kompletuar, shpejtësia = %s"
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Pakot a radhitura kanë nënshkrime të pa pranueshëm"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "A dëshironi të vazhdoni me instalimin e tyre ?"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1634,57 +1583,57 @@ msgstr ""
 "%s\n"
 "A dëshironi t'azhurnoni bazën e të dhënave urpmi"
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "Instalimi dështio"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr "shpërndarje e %s"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr "instalimi i %s"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instalimi i pakove `%s' (%s/%s)..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Tento një instalim pa verifikimin e mvarësive? (p/J) "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Tento një instalim më të forcuar (--force)? (p/J) "
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "Instalimi i transmetimit të %d dështio"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "Instalimi është i mundur"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "Gjdo gjë është veçse e instaluar"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr ""
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1709,24 +1658,24 @@ msgstr ""
 "\n"
 "dhe [opcionet] janë nga\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - krijo një burim azhurnimi.\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
 "  --probe-synthesis - tento në gjetjen dhe përdorimin e skedares sintezë.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr ""
 "  --probe-hdlist - tento në gjetjen dhe përdorimin e skedares hdlist.\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
@@ -1735,7 +1684,7 @@ msgstr ""
 "  --no-probe     - mos tento gjetjen e ndonjë sintezë apo\n"
 "                   skedare hdlist.\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -1744,7 +1693,7 @@ msgstr ""
 "  --distrib      - krijo automatikisht të gjitha burimet nga një\n"
 "                   burim instalues.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1756,7 +1705,7 @@ msgstr ""
 "                   kontribuese, azhrunuese apo çfarë do çoftë mbasi\n"
 "                   të jetë konfiguruar ;-)\n"
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1765,7 +1714,7 @@ msgstr ""
 "  --from          - përdore url e specifikuar të pasqyreve me marrëvshje\n"
 "                    është %s\n"
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1776,7 +1725,7 @@ msgstr ""
 "                   pranohet nga versioni shpërndarës i treguar nga\n"
 "                   versioni i pakove instaluese mandrake-release.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
@@ -1785,7 +1734,7 @@ msgstr ""
 "  --arch         - përdore arqitekturën e specifikuar, me marrëveshje është\n"
 "                   arqitektura e pakove instaluese mandrake-release.\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
@@ -1795,73 +1744,52 @@ msgstr ""
 "azhurnim,\n"
 "                   vetëm skedarja:// protokoli është i lejuar.\n"
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - pastrim i majave në repertort e fshehtë.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - përfitim i forcuar në skedaret hdlist.\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"opcione të pa njoftura '%s'\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "nuk mund të shtoj azhurnime në shpërndarësinë cooker\n"
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "rikuperimi i pasqyreve në %s..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"specifikim i pa nevojshëm <shteg relativë i hdlist> me --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "specifikim i pa nevojshëm <shteg relativë i hdlist> me --distrib"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "i pa mundur azhurnimi i burimit \"%s\"\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"<shteg relativë i hdlist> mungon\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<shteg relativë i hdlist> mungon\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"direktivë `me' mungon burimi i rrjetit\n"
+msgid "`with' missing for network media\n"
+msgstr "direktivë `me' mungon burimi i rrjetit\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "i pa mundur krijimi i burimit \"%s\"\n"
@@ -1880,6 +1808,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - zgjidhi të gjitha burimet.\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"opcione të pa njoftura '%s'\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1894,7 +1831,7 @@ msgstr ""
 "hyrja zhdukëse mungon\n"
 "(një nga %s)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1903,28 +1840,28 @@ msgstr ""
 "përdorim:urmpi.update [option] <emri> ...\n"
 "ku <emri> është një emrim i burimit azhurnues.\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - azhurno vetëm burimet azhurnuese.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr ""
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - zgjidhi të gjitha burimet jo levizëse.\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "asgjë për tu azhurnuar (përdore urpmi.addmedia për të shtuar një burim)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1933,7 +1870,7 @@ msgstr ""
 "hyrja për azhurnim mungon\n"
 "(një nga %s)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1950,40 +1887,40 @@ msgstr ""
 "\n"
 "përdorues:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - shpalosi pakotë lira.\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - shpalosi burimet e lira.\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, fuzzy, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-media   - shpalosi burimet e lira.\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr "  --list-nodes   - shpalosi nyjet kur ato përdoren në --parallel.\n"
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr ""
 "  --list-aliass   - shpalosi burimet e lira paralele me pseudonime të "
 "njëjta.\n"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
@@ -1993,7 +1930,7 @@ msgstr ""
 "dhënave\n"
 "                   të urpmi me dalje standarde (vetëm root).\n"
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
@@ -2001,24 +1938,24 @@ msgstr ""
 "  --sources      - jepi të gjitha burimet e pakove para se të shkarkohen "
 "(vetëm root).\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, fuzzy, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --all           - çfaqi të gjitha etiketat.\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - shtrirja e hetimeve në pakot e mvarura.\n"
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -2027,58 +1964,114 @@ msgstr ""
 "  -u             - zhduke pakon nëse një version më i ri është veçse i "
 "instaluar.\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - dalje komplete me pakon që duhet të zhduket.\n"
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - lejon hulumtimet në pajisje për ta gjetur pakon.\n"
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, fuzzy, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 "  -i             - çfaqi informacionet përdoruse në formë lexuse humane.\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - çfaqi grupet njashtu dhe emrat.\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - çfaqe versionin me hollësi, njashtu dhe emrin.\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, fuzzy, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  --list         - shpalosi pakotë lira.\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 "  emrat apo skedaret rpm të marra në linjën komanduese janë nën hetim.\n"
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: opcion i pa njoftur \"-%s\", verifikoje përdorimin me --help\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: nuk mund ta lexojë skedaren rpm \"%s\"\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--liste-nodes mund të përdoret vetëm me --parallel"
 
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "Program i pa njoftur për riatdhezimin e faqeve web `%s' !!!\n"
+
+#~ msgid "copy failed: %s"
+#~ msgstr "kopjimi dështoi: %s"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "wget nuk është i instaluar\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "wget dështoi: dalje me kodin %d ose me sinjalin %d\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "curl nuk është i instaluar\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "curl  dështoi: dalje me kodin %d ose me sinjalin %d\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "rsync mungon\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "rsync dështoi: dalje me kodin %d ose me sinjalin %d\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "ssh mungon\n"
+
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpme: mundësi e pa njoftur \"-%s\", verifikoje përdorimin me --help\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpmi: variant e pa njoftur \"-%s\", verifikoje përdorimin me --help\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr ""
+#~ "Për ti përmbushur mvarësit, pakot e radhitura duhet të instalohen (%d MB)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "specifikim i pa nevojshëm <shteg relativë i hdlist> me --distrib"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "<shteg relativë i hdlist> mungon\n"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "direktivë `me' mungon burimi i rrjetit\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpmq: opcion i pa njoftur \"-%s\", verifikoje përdorimin me --help\n"
+
 #~ msgid "no webfetch (curl or wget currently) found\n"
 #~ msgstr "asnjë program riatdhezues për faqe web (curl apo wget) i gjetur\n"
 
diff --git a/po/sr.po b/po/sr.po
index 11a7b93a..32151201 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-sr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2004-02-01 19:27+0100\n"
 "Last-Translator: Toma Jankovic <webmaster@mandrake.co.yu>\n"
 "Language-Team: serbian <mdk@linux.rs.sr>\n"
@@ -55,22 +55,22 @@ msgstr ""
 "Аутоматска инсталациjа пакетa...\n"
 "Захтевали сте инсталациjу пакета %s\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "Да ли је овако добро?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "У реду"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Одустани"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (Д/н) "
@@ -80,124 +80,63 @@ msgstr " (Д/н) "
 msgid "%s: command not found\n"
 msgstr "%s: команда ниjе пронaђенa\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "where [options] are from\n"
 msgstr ""
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - приказује овај екран о помоћи.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, fuzzy, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "  --group         - приказује таг групе: група.\n"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, fuzzy, c-format
 msgid "                    defaults is %s.\n"
 msgstr "  -l             - приказује фајлове у пакету.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Непознати webfetch `%s' !!!\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "непознати протокол дефинисан за %s"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "webfetch није пронађен, подржани webfetch-ови су: %s\n"
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "не могу да подржим протокол: %s"
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "копирање неуспело: %s"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "недостаје wget\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget није успео: изашао са %d или сигналом %d\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "недостаје curl\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl није успео: изашао са %d или сигналом  %d\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "недостаје rsync\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "rsync није успео: изашао са %d или сигнал %d\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "недостаје ssh\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% за %s завршено, време до краја = %s, брзина = %s"
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% завршено, брзина = %s"
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...повраћај неуспео: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "синтаксна грешка у конфигурационом фајлу у реду %s"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 "медиј \"%s\" покушава да користи hdlist која је већ коришћена, медиј ће бити "
 "игнорисан"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 "медиј \"%s\" покушава да користи листу која је већ употребљена, медиј је "
 "игнорисан"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -205,39 +144,39 @@ msgid ""
 msgstr ""
 "не могу да користим медиј \"%s\" пошто се датотеку листе користи други медиј"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 "не могу да користим име \"%s\" као име за неименовани медијум зато што је то "
 "име већ у употреби"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr "не могу да узмем медиј \"%s\" у обзир пошто не постоји листа [%s] "
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "не могу да одредим медиј за овај hdlist фајл [%s]"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "не могу да приступим hdlist фајлу за \"%s\", медиј је игнорисан"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "не могу да приступим фајлу листе за \"%s\", mедиј игнорисан"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "покушавам да премостим постојећи медиј \"%s\", избегавам"
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -246,92 +185,92 @@ msgstr ""
 "виртуални медиј \"%s\" не би требао да има дефинисиану  hdlist или листу "
 "фајлова, игноришем медиј"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "виртулени медиј \"%s\" би требао да има чист url, игноришем медиј"
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "не могу да пронађем hdlist датотеку за \"%s\", медијум је игнорисан"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "немогу да пронађем датотеку листе за \"%s\", медијум је игнорисан"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "некохерентна датотека листе за \"%s\", медиј је игнорисан"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "не могу да истражим датотеку листе за \"%s\", медиј је игнорисан"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "превише тачака монтирања за преносни медиј \"%s\""
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "узимам преносни уређај као \"%s\""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "користећи различит преносни уређај или [%s] за \"%s\""
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "не могу да добавим путању за преносни медиј \"%s\""
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "не могу да извршим упис у конфигурациону датотеку [%s]"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "уписујем у конфигурациону датотеку [%s]"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "Не могу да користим паралелни мод са use-distrib модом"
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "Не могу да парсирам \"%s\" у фајл [%s]"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "испитујем паралелни држач у фајлу [%s]"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "пронађен паралелни држач ѕа нодове: %s"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "користим додељени медиј за паралелни мод: %s"
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "не могу да користим паралелну опцију \"%s\""
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -340,90 +279,90 @@ msgstr ""
 "--synthesis се не може користити са --media, --excludemedia, --sortmedia, --"
 "update или --parallel"
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "испитујем synthesis фајл [%s]"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "испитујем  hdlist фајл [%s]"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "виртуални медиј \"%s\" није локални, игноришем медиј"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "проблем са читањем hdlist или synthesis фајла за медиј \"%s\""
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "сада се проверавају међузависности пакета\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "прескачем пакет %s"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "ће инсталирати уместо ажурирати пакет %s"
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "не могу да отворим rpmdb"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "медиј \"%s\" већ постоји"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr "виртуални медиј мора да буде локални"
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "додани медиј %s"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "не могу да приступим првом инсталационом медију"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "копирам hdlist фајл..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "...копирање није успело"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "...копирање завршено"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
@@ -432,43 +371,49 @@ msgstr ""
 "не могу да приступим првом инсталационом медију (није пронађен Mandrake/base/"
 "hdlists фајл)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "добављам hdlists фајл..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "... добављање завршено"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...повраћај неуспео: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "неправилан hdlist опис \"%s\" и hdlists фајлу"
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "покушавам да селектујем непостојећи медиј \"%s\""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "покушавам да селектујем вишеструки медиј: %s"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "уклањам медиј \"%s\""
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -479,7 +424,7 @@ msgstr ""
 "ово се може десити уколико сте ручно монтирали директоријум приликом "
 "креирања медија."
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -488,222 +433,222 @@ msgstr ""
 "виртуални медиј \"%s\" би требао да има исправан source hdlist или "
 "synthesis, игноришем медиј"
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "копирам описни фајл за \"%s\"..."
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "прорачунавам md5sum постојеће source hdlist (или synthesis)"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "испитујем MD5SUM фајл"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "копирање изворне hdlist (или synthesis) за \"%s\"..."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "прорачунавам md5sum копиране  source hdlist (или  synthesis)"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, fuzzy, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "копирање [%s] неуспело"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "проблем са читањем synthesis фајла за медиј \"%s\""
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "читам rpm фајлове са [%s]"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "не могу да прочитам rpm фајлове са [%s]: %s"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "нема rpm датотека на [%s]"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "добављам изорни hdlist (или synthesis) за \"%s\"..."
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "пронађена тестирана hdlist (или synthesis) као %s"
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "прорачунавам md5sum of retrieved source hdlist (or synthesis)"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr "md5sum не одговара"
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, fuzzy, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "повраћај изворне hdlist (или synthesis) неуспео"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "није пронађена hdlist датотека за медиј \"%s\""
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "фајл [%s] је већ корисштен за исти медиј \"%s\""
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "не могу да парсирам hdlist датотеку за \"%s\""
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "не могу да упишем датотеку листе за \"%s\""
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "уписујем листу фајлова за медиј \"%s\""
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "нема шта да се упише у датотеку листе за \"%s\""
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "испитукем фајл са јавним кључем за \"%s\"..."
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "..импортовани кључ%s од јавног кључа за \"%s\""
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "не могу да импортујем јавни кључ за \"%s\""
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "читам хедере са медија \"%s\""
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "креирам hdlist [%s]"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "креирам hdlist симтезну датотеку за медиј \"%s\""
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "пронађено %d хедера у кеш меморији"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "уклањам %d obsolete hхедере у кеш меморији"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "монтирам %s"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "демонтирам %s"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "премештени %s уноси у depslist"
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "нема премештених уноса у depslist"
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "погрешно име rpm датотеке [%s]"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "добављам rpm фајл [%s] ..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "не могу да приступим rpm датотеци [%s]"
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "не могу да региструјем  rpm фајл"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "грешка при регистровању локалних пакета"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "Нема пакета са именом %s"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Следећи пакети садрже %s: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "постоји више пакета са истим именом rpm датотеке \"%s\""
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "не могу да исправно парсирам [%s] за вредност \"%s\""
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -712,63 +657,63 @@ msgstr ""
 "медиј \"%s\" користи фајл са погрешном листом:\n"
 "  мирор вероватно није ажуриран, покушавам да користим алтернативни метод"
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "медиј \"%s\" не дефинише ни једну локацију за rpm фајлове"
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "пакет %s није пронађен."
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi база података закључана"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "медиј \"%s\" није изабран"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "не могу да прочитам rpm датотеку [%s] са медија \"%s\""
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 "некохерентан медиј \"%s\" је означен као преносни али то није у стварности"
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "не могу да приступим медиjу \"%s\""
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "погрешан унос: [%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "добављам rpm фајлове ѕа медиј \"%s\"..."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "Припремам..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "користим процес %d за извршење трансакције"
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -776,82 +721,97 @@ msgstr ""
 "креирана трансакција за инсталирање на  %s (уклони=%d, инсталирај=%d, "
 "ажурирај=%d)"
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr "не могу да креирам трансакцију"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "уклањам пакет %s"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "не могу да уклоним пакет %s"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "додајем пакет %s (id=%d, eid=%d, update=%d, file=%s)"
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "не могу да инсталирам пакет %s"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "због не постојања %s"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "због не задовољеног %s"
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr "покушавам да прикажем %s"
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr "да бих задржао %s"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "да би инсталирао %s"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "због конфликта са %s"
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr "незахтевано"
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Неисправан потпис (%s)"
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "Погрешан ID кључа(%s)"
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Недостаје потпис (%s)"
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "лоша proxyдекларација у командној линији\n"
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: не могу да прочитам rpm датотеку \"%s\"\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Погрешан избор, пробајте поново\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -868,25 +828,25 @@ msgstr ""
 "\n"
 "употреба:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - приказује овај екран о помоћи.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - аутоматски селектује пакете од понуђеног.\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 "  --test         - проверава да ли се може извести исправна инсталација.\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
@@ -894,17 +854,17 @@ msgstr ""
 "  --force        - приморава на инвокацију чак и ако неки пакети не "
 "постоје.\n"
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - дистрибуирани urpmi преко машина са надимком.\n"
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --curl         - користи још један root за rpm инсталацију.\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -913,72 +873,62 @@ msgstr ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to (un)install a chroot with --root option.\n"
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - verbose режим.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - изабери све пакете који одговарају изразу.\n"
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: непозната опциjа \"-%s\", проверите употребу са --help\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr "непознати пакети"
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "непознати пакет"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "уклањање пакета %s ће нарушити Ваш систем"
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr "Нема ничега што би се могло уклонити"
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "Проверавам како бих уклонио следеће пакете"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr "Ради задовољења зависности, следећи пакети ће бити уклоњени (%d MB)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (д/Н) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "уклањам %s"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr "Уклањање није успело"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Погрешан избор, пробајте поново\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -994,39 +944,39 @@ msgstr ""
 "\n"
 "употреба:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - користи само update медиј.\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - користи само дати медиј, одвојен зарезом.\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - не користи дати медиј, одвојен зарезом.\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 "  --sortmedia    - сортира медије на основу подстрингова одвојених зарезом.\n"
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr "  --synthesis    - користи дати synthesis уместо urpmi-јеве базе.\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  -verbose       - verbose режим.\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1037,87 +987,87 @@ msgstr ""
 "дат таг у команди\n"
 "                   линија, некомпатибилна са интерактивним модом).\n"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --uniq         - не приказује идентичне линије.\n"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all           - приказује све тагове.\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group         - приказује таг групе: група.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size          - приказује таг величине: величина.\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --size          - приказује таг величине: величина.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary       - приказује таг сажетка: сажетак.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description   - приказује таг описа: опис.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr "  --sourcerpm    - приказује таг sourcerpm: source rpm.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr "  --packager     - приказује таг packager: packager.\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr "  --buildhost    - приказује таг buildhost: build host.\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --url          - приказује таг url: url.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr "  --provides      - приказује таг обезбеђује: све обезбеђује.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr "  --requires      - приказује таг захтева: сви захтеви\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files         - приказује таг фајлове: све фајлове.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr "  --conflicts     - приказује таг конфликата: сви конфликти.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr "  --obsoletes     - приказује таг вишак: сви вишкови (у више реда).\n"
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
@@ -1125,24 +1075,24 @@ msgid ""
 msgstr ""
 "  --env          - користи специфично окружење (типично извештај о грешци).\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr "  -i             - игнорише разлику у карактеру у било којој шеми.\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - приказује верзију, издање и архитектуру, укључујући и "
 "име.\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - укључује перл код директно као perl -e.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
@@ -1150,7 +1100,7 @@ msgstr ""
 "  -a             - инарни AND oоператор, истинит уколико су оба израза "
 "истинита.\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
@@ -1158,22 +1108,22 @@ msgstr ""
 "  -o             - бинарни OR оператор, истинит уколико је један израз "
 "тачан.\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - бинарни NOT, истинит уколико је израз погрешан.\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr "  (              - лева заграда за отоврање групе израза.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr "  )              - десна заграда за затварање групе израза.\n"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
@@ -1182,12 +1132,12 @@ msgstr ""
 "повратни је :\n"
 "%s\n"
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "користим дато окружење на %s\n"
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1202,19 +1152,19 @@ msgstr ""
 "Ово је бесплатан софтвер и може бити слободно редистрибуиран под условима \n"
 "GNU и GPL. употреба:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - користи дати synthesis уместо urpmi-јеве базе података.\n"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - аутоматска избор пакета да би се ажурирао систем.\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
@@ -1223,7 +1173,7 @@ msgstr ""
 "  --no-uninstall - никада не тражи деинсталацију пакета, обустави "
 "инсталацију.\n"
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1233,7 +1183,7 @@ msgstr ""
 "захтевани пакет\n"
 "                   који води уклањању.\n"
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1244,37 +1194,37 @@ msgstr ""
 "                   више пакета од датог броја,\n"
 "                   default је %d.\n"
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - мала дужина трансакције, основна поставка је %d.\n"
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - узрокује fuzzy претрагу (исто као -y).\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - следећи пакет је изворни пакет (исто као и  -s).\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - инсталира само пакете са изворним кодом.\n"
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean      - уклања rpm из кеша пре било чега другог.\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - чува rpm који нису коришћени у кешу.\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1284,7 +1234,7 @@ msgstr ""
 "без\n"
 "                   провере међузависности пакета.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1294,7 +1244,7 @@ msgstr ""
 "без\n"
 "                   провере међузависности и интегритета.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1303,22 +1253,22 @@ msgstr ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - користи wget за добављање удаљених фајлова.\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - користи curl за добављање удаљених фајлова.\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - лимитира брзину download-а.\n"
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, fuzzy, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1328,7 +1278,7 @@ msgstr ""
 "                   (--no-verify-rpm не веригикује, стандардна је "
 "верификација).\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1338,7 +1288,7 @@ msgstr ""
 "претпоставља\n"
 "                   да је 1080 по default-у (формат је <proxyhost[:port]>).\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1347,7 +1297,7 @@ msgstr ""
 "  --proxy-user   - одређује корисника и лозинку који се користе за proxy\n"
 "                   аутентификацију (формат је <user:password>).\n"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1356,12 +1306,12 @@ msgstr ""
 "  --bug          - прави извештај о грешци у директоријуму прослеђеном "
 "као                      следећи аргумент.\n"
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - користи X интерфејс.\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1370,7 +1320,7 @@ msgstr ""
 "  --best-output  - бира најбољи интерфејс сходно окружењу:\n"
 "                   X или текстуални мод.\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1380,77 +1330,66 @@ msgstr ""
 "                   (--no-verify-rpm не веригикује, стандардна је "
 "верификација).\n"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - искључује путању раздвојену зарезом.\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - искључује docs фајлове.\n"
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - бира сва поклапања у командној линији.\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 "  -p            - дозвољава претраживање по пружању ради налажења пакета.\n"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - не претражује доступне ради налажења пакета.\n"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - узрокује fuzzy претрагу (као и  --fuzzy).\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 "  -s             - следећи пакет је изворни пакет (исто као и  --src).\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - тихи режим (мало порука).\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  имена или rpm фајлови дати у командној линији ће бити инсталирани.\n"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr ""
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "лоша proxyдекларација у командној линији\n"
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: непозната опциjа \"-%s\", проверите употребу са --help\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 "Шта се може учинити са бинарним rpm пакетима када се користи опција --"
 "install-src"
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1463,22 +1402,22 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "Не ради ништа"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr ""
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr ""
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1488,12 +1427,12 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, fuzzy, c-format
 msgid "Install it"
 msgstr "Инсталациjа није успела"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1502,42 +1441,42 @@ msgstr ""
 "Директоријум  [%s] већ постоји, изаберите други директоријум за пријављивање "
 "багова или га избришите"
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "не могу да направим директоријум [%s] за извештај о грешци"
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Само администратор може да инсталира пакете"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "Један од следећих пакета је потребан да би инсталирали %s:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Потребан(и) су следећи пакет(и):"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Шта желите? (1-%d) "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "Инсталација пакета..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "покрећем..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1546,12 +1485,12 @@ msgstr ""
 "Неки изабрани пакети се не могу инсталирати:\n"
 "%s"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr "да ли се слажете?"
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1562,7 +1501,7 @@ msgstr ""
 "морају бити уклоњени да би остали могли да се ажурирају:\n"
 "%s\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1571,14 +1510,14 @@ msgstr ""
 "Следећи пакети се морају уклонити да би други могли да буду ажурирани:\n"
 "%s"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr "Ради задовољења зависности, следећи пакети ће бити инсталирани (%d MB)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1587,37 +1526,47 @@ msgstr ""
 "Морате да имате root овлашћења да би инсталирали следеће пакете:\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "извор пакета ниjе доступан, излазим..."
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Убаците медиj са именом %s у уређај [%s]"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Притисните enter када будете спремни..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Скидам пакет `%s'..."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% за %s завршено, време до краја = %s, брзина = %s"
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% завршено, брзина = %s"
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Следећи пакети имају неисправне потписе"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Да ли желите да наставите конфигурацију ?"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1628,57 +1577,57 @@ msgstr ""
 "%s\n"
 "Можда желите да ажурирате вашу urpmi базу података."
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "Инсталациjа није успела"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr "дистрибуирам %s"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr "Инсталирам %s"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Инсталирам пакет `%s' (%s/%s)..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Инсталиација без провере зависности (дa/Нe)? "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Присилна инсталација (--force)? (дa/Нe) ?"
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d инстлациона трансакција није успела"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "Инсталација је могућа"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "све је већ инсталирано"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr "рестартујем urpmi"
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1702,22 +1651,22 @@ msgstr ""
 "\n"
 "       removable://<путaњa>\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - креира update медиј.\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr "  --probe-synthesis - покушава да пронађе и користи synthesis фајл.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr "  --probe-hdlist - покушава да пронађе и користи hdlist фајл.\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
@@ -1726,7 +1675,7 @@ msgstr ""
 "  --no-probe     - не покушава да пронађе било који synthesis или\n"
 "                   hdlist фајл.\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -1735,7 +1684,7 @@ msgstr ""
 "  --distrib      - аутоматски направи све медије са инсталационог\n"
 "                    медија.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1747,7 +1696,7 @@ msgstr ""
 "                     надоградња или блио шта друго што може да се "
 "подеси ;-)\n"
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1756,7 +1705,7 @@ msgstr ""
 "  --form        - користи дату url адресу за лист мирора, подразумевано је\n"
 "                    %s\n"
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1767,7 +1716,7 @@ msgstr ""
 "                   из верзије дистрибуције која је наведена у\n"
 "                   деинсталираном mandrake-release пакету.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
@@ -1776,7 +1725,7 @@ msgstr ""
 "  --arch       - користи дату архитектуру, подразумеваноа је архитектура\n"
 "                    инсталираног Mandrake пакета.\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
@@ -1785,73 +1734,52 @@ msgstr ""
 "  --virtual      - креира виртуелни медиј који су увек ажурирани ,\n"
 "                   дозвољен је само фајл:// protocol.\n"
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - деактивира MD5SUM проверу фајла.\n"
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - чисти директоријум са кешом надглавља.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - приморава на генерисање hdlist фајлова.\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"непознате опције '%s'\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "не могу да додам надоградње cooker дистрибуцији\n"
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "добављам мироре на %s ..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"недостаjе <релативна путaња hdlist> са --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "недостаjе <релативна путaња hdlist> са --distrib"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "не могу да aжурирам медиj \"%s\"\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"недостаjе <релативна путaња hdlist>\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "недостаjе <релативна путaња hdlist>\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"`са недостатком за мрежни ftp медиj\n"
+msgid "`with' missing for network media\n"
+msgstr "`са недостатком за мрежни ftp медиj\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "не могу да креирам медиj \"%s\"\n"
@@ -1870,6 +1798,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - селектује све медије.\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"непознате опције '%s'\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1884,7 +1821,7 @@ msgstr ""
 "недостаjе унос за брисaњe\n"
 "(jедан од %s)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1893,27 +1830,27 @@ msgstr ""
 "употреба: urpmi.update [опције] <име> ...\n"
 "где <име> јесте име медија за ажурирање.\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - ажурирај само медијум за ажурирање.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr "  --force-key    - приморава на ажурирање gpg кључа.\n"
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - селектује све не преносиве медије.\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "нема ничега зa aжурирaњe (користи urpmi.addmedia за додавaње медиja)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1922,7 +1859,7 @@ msgstr ""
 "недостаjе унос за aжурирaње\n"
 "(jедан од %s)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1938,41 +1875,41 @@ msgstr ""
 "\n"
 "употреба:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - приказује листу пакета.\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media         - приказује листу медија.\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-media         - приказује листу медија и љихов урл.\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 "  --list-nodes         - приказује листу чворова при коришћењу опције --"
 "parallel.\n"
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases         - приказује листу паралелних алијаса.\n"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
@@ -1981,14 +1918,14 @@ msgstr ""
 "  --headers      - екстрактује хедере за пакете приказане из urpmi db на\n"
 "                   stdout (само root).\n"
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 "  --sources      - приказује све изворне пакете пре download-а (само root).\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
@@ -1997,17 +1934,17 @@ msgstr ""
 "  --use-distrib  - подешава urpmi у лету са distrib стабла.\n"
 "                   Ова опција дозвољава испитивање дистрибуције.\n"
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - приказује лог са изменама.\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - проширује претрагу на зависност пакета.\n"
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -2015,59 +1952,112 @@ msgid ""
 msgstr ""
 "  -u             - уклања пакете уколико је новија верзија већ инсталирана.\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c              - потпун излаз са пакетом који треба да се уклони.\n"
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - претрага уназад за оним што захтева пакет.\n"
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 "  -i             - приказје корисне информације у, за људе читљивном "
 "облику.\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - приказује групе укључујући и име.\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - приказује верзију укључујући и име.\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - приказује фајлове у пакету.\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 "  имена или rpm фајлови који су дати у командној линији се проверавају.\n"
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: непозната опциjа \"-%s\", проверите употребу са --help\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: не могу да прочитам rpm датотеку \"%s\"\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "  --list-nodes се може користити само са опцијом --parallel"
 
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "Непознати webfetch `%s' !!!\n"
+
+#~ msgid "copy failed: %s"
+#~ msgstr "копирање неуспело: %s"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "недостаје wget\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "wget није успео: изашао са %d или сигналом %d\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "недостаје curl\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "curl није успео: изашао са %d или сигналом  %d\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "недостаје rsync\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "rsync није успео: изашао са %d или сигнал %d\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "недостаје ssh\n"
+
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmi: непозната опциjа \"-%s\", проверите употребу са --help\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmi: непозната опциjа \"-%s\", проверите употребу са --help\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr ""
+#~ "Ради задовољења зависности, следећи пакети ће бити инсталирани (%d MB)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "недостаjе <релативна путaња hdlist> са --distrib"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "недостаjе <релативна путaња hdlist>\n"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "`са недостатком за мрежни ftp медиj\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmq: непозната опциjа \"-%s\", проверите употребу са --help\n"
+
 #~ msgid "no webfetch (curl or wget currently) found\n"
 #~ msgstr "webfetch (тренутно сurl или wget) није пронађен\n"
 
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index ae83fc3d..b9bbbb73 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-sr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2004-02-01 19:27+0100\n"
 "Last-Translator: Toma Jankovic_<webmaster@mandrake.co.yu>\n"
 "Language-Team: serbian <mdk@linux.rs.sr>\n"
@@ -55,22 +55,22 @@ msgstr ""
 "Automatska instalacija paketa...\n"
 "Zahtevali ste instalaciju paketa %s\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "Da li je ovako dobro?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "U redu"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Odustani"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (D/n) "
@@ -80,124 +80,63 @@ msgstr " (D/n) "
 msgid "%s: command not found\n"
 msgstr "%s: komanda nije pronađena\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "where [options] are from\n"
 msgstr ""
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - prikazuje ovaj ekran o pomoći.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, fuzzy, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "  --group         - prikazuje tag grupe: grupa.\n"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, fuzzy, c-format
 msgid "                    defaults is %s.\n"
 msgstr "  -l             - prikazuje fajlove u paketu.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Nepoznati webfetch `%s' !!!\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "nepoznati protokol definisan za %s"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "webfetch nije pronađen, podržani webfetch-ovi su: %s\n"
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "ne mogu da podržim protokol: %s"
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "kopiranje neuspelo: %s"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "nedostaje wget\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget nije uspeo: izašao sa %d ili signalom %d\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "nedostaje curl\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl nije uspeo: izašao sa %d ili signalom  %d\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "nedostaje rsync\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "rsync nije uspeo: izašao sa %d ili signal %d\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "nedostaje ssh\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% za %s završeno, vreme do kraja = %s, brzina = %s"
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% završeno, brzina = %s"
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...povraćaj neuspeo: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "sintaksna greška u konfiguracionom fajlu u redu %s"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 "medij \"%s\" pokušava da koristi hdlist koja je već korišćena, medij će biti "
 "ignorisan"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 "medij \"%s\" pokušava da koristi listu koja je već upotrebljena, medij je "
 "ignorisan"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -205,39 +144,39 @@ msgid ""
 msgstr ""
 "ne mogu da koristim medij \"%s\" pošto se datoteku liste koristi drugi medij"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 "ne mogu da koristim ime \"%s\" kao ime za neimenovani medijum zato što je to "
 "ime već u upotrebi"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr "ne mogu da uzmem medij \"%s\" u obzir pošto ne postoji lista [%s] "
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "ne mogu da odredim medij za ovaj hdlist fajl [%s]"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "ne mogu da pristupim hdlist fajlu za \"%s\", medij je ignorisan"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "ne mogu da pristupim fajlu liste za \"%s\", medij ignorisan"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "pokušavam da premostim postojeći medij \"%s\", izbegavam"
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -246,92 +185,92 @@ msgstr ""
 "virtualni medij \"%s\" ne bi trebao da ima definisianu  hdlist ili listu "
 "fajlova, ignorišem medij"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "virtuleni medij \"%s\" bi trebao da ima čist url, ignorišem medij"
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "ne mogu da pronađem hdlist datoteku za \"%s\", medijum je ignorisan"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "nemogu da pronađem datoteku liste za \"%s\", medijum je ignorisan"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "nekoherentna datoteka liste za \"%s\", medij je ignorisan"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "ne mogu da istražim datoteku liste za \"%s\", medij je ignorisan"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "previše tačaka montiranja za prenosni medij \"%s\""
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "uzimam prenosni uređaj kao \"%s\""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "koristeći različit prenosni uređaj ili [%s] za \"%s\""
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "ne mogu da dobavim putanju za prenosni medij \"%s\""
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "ne mogu da izvršim upis u konfiguracionu datoteku [%s]"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "upisujem u konfiguracionu datoteku [%s]"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "Ne mogu da koristim paralelni mod sa use-distrib modom"
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "Ne mogu da parsiram \"%s\" u fajl [%s]"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "ispitujem paralelni držač u fajlu [%s]"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "pronađen paralelni držač dza nodove: %s"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "koristim dodeljeni medij za paralelni mod: %s"
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "ne mogu da koristim paralelnu opciju \"%s\""
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -340,90 +279,90 @@ msgstr ""
 "--synthesis se ne može koristiti sa --media, --excludemedia, --sortmedia, --"
 "update ili --parallel"
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "ispitujem synthesis fajl [%s]"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "ispitujem  hdlist fajl [%s]"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "virtualni medij \"%s\" nije lokalni, ignorišem medij"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "problem sa čitanjem hdlist ili synthesis fajla za medij \"%s\""
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "sada se proveravaju međuzavisnosti paketa\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "preskačem paket %s"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "će instalirati umesto ažurirati paket %s"
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "ne mogu da otvorim rpmdb"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "medij \"%s\" već postoji"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr "virtualni medij mora da bude lokalni"
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "dodani medij %s"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "ne mogu da pristupim prvom instalacionom mediju"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "kopiram hdlist fajl..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "...kopiranje nije uspelo"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "...kopiranje završeno"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
@@ -432,43 +371,49 @@ msgstr ""
 "ne mogu da pristupim prvom instalacionom mediju (nije pronađen Mandrake/base/"
 "hdlists fajl)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "dobavljam hdlists fajl..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "... dobavljanje završeno"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...povraćaj neuspeo: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "nepravilan hdlist opis \"%s\" i hdlists fajlu"
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "pokušavam da selektujem nepostojeći medij \"%s\""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "pokušavam da selektujem višestruki medij: %s"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "uklanjam medij \"%s\""
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -479,7 +424,7 @@ msgstr ""
 "ovo se može desiti ukoliko ste ručno montirali direktorijum prilikom "
 "kreiranja medija."
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -488,222 +433,222 @@ msgstr ""
 "virtualni medij \"%s\" bi trebao da ima ispravan source hdlist ili "
 "synthesis, ignorišem medij"
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "kopiram opisni fajl za \"%s\"..."
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "proračunavam md5sum postojeće source hdlist (ili synthesis)"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "ispitujem MD5SUM fajl"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "kopiranje izvorne hdlist (ili synthesis) za \"%s\"..."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "proračunavam md5sum kopirane  source hdlist (ili  synthesis)"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, fuzzy, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "kopiranje [%s] neuspelo"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "problem sa čitanjem synthesis fajla za medij \"%s\""
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "čitam rpm fajlove sa [%s]"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "ne mogu da pročitam rpm fajlove sa [%s]: %s"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "nema rpm datoteka na [%s]"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "dobavljam izorni hdlist (ili synthesis) za \"%s\"..."
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "pronađena testirana hdlist (ili synthesis) kao %s"
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "proračunavam md5sum of retrieved source hdlist (or synthesis)"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr "md5sum ne odgovara"
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, fuzzy, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "povraćaj izvorne hdlist (ili synthesis) neuspeo"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "nije pronađena hdlist datoteka za medij \"%s\""
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "fajl [%s] je već korisšten za isti medij \"%s\""
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "ne mogu da parsiram hdlist datoteku za \"%s\""
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "ne mogu da upišem datoteku liste za \"%s\""
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "upisujem listu fajlova za medij \"%s\""
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "nema šta da se upiše u datoteku liste za \"%s\""
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "ispitukem fajl sa javnim ključem za \"%s\"..."
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "..importovani ključ%s od javnog ključa za \"%s\""
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "ne mogu da importujem javni ključ za \"%s\""
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "čitam hedere sa medija \"%s\""
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "kreiram hdlist [%s]"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "kreiram hdlist simteznu datoteku za medij \"%s\""
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "pronađeno %d hedera u keš memoriji"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "uklanjam %d obsolete hhedere u keš memoriji"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "montiram %s"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "demontiram %s"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "premešteni %s unosi u depslist"
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "nema premeštenih unosa u depslist"
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "pogrešno ime rpm datoteke [%s]"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "dobavljam rpm fajl [%s] ..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "ne mogu da pristupim rpm datoteci [%s]"
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "ne mogu da registrujem  rpm fajl"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "greška pri registrovanju lokalnih paketa"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "Nema paketa sa imenom %s"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Sledeći paketi sadrže %s: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "postoji više paketa sa istim imenom rpm datoteke \"%s\""
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "ne mogu da ispravno parsiram [%s] za vrednost \"%s\""
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -712,63 +657,63 @@ msgstr ""
 "medij \"%s\" koristi fajl sa pogrešnom listom:\n"
 "  miror verovatno nije ažuriran, pokušavam da koristim alternativni metod"
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "medij \"%s\" ne definiše ni jednu lokaciju za rpm fajlove"
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "paket %s nije pronađen."
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi baza podataka zaključana"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "medij \"%s\" nije izabran"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "ne mogu da pročitam rpm datoteku [%s] sa medija \"%s\""
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 "nekoherentan medij \"%s\" je označen kao prenosni ali to nije u stvarnosti"
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "ne mogu da pristupim mediju \"%s\""
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "pogrešan unos: [%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "dobavljam rpm fajlove dza medij \"%s\"..."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "Pripremam..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "koristim proces %d za izvršenje transakcije"
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -776,82 +721,97 @@ msgstr ""
 "kreirana transakcija za instaliranje na  %s (ukloni=%d, instaliraj=%d, "
 "ažuriraj=%d)"
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr "ne mogu da kreiram transakciju"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "uklanjam paket %s"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "ne mogu da uklonim paket %s"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "dodajem paket %s (id=%d, eid=%d, update=%d, file=%s)"
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "ne mogu da instaliram paket %s"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "zbog ne postojanja %s"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "zbog ne zadovoljenog %s"
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr "pokušavam da prikažem %s"
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr "da bih zadržao %s"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "da bi instalirao %s"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "zbog konflikta sa %s"
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr "nezahtevano"
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Neispravan potpis (%s)"
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "Pogrešan ID ključa(%s)"
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Nedostaje potpis (%s)"
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "loša proxydeklaracija u komandnoj liniji\n"
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: ne mogu da pročitam rpm datoteku \"%s\"\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Pogrešan izbor, probajte ponovo\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -868,25 +828,25 @@ msgstr ""
 "\n"
 "upotreba:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - prikazuje ovaj ekran o pomoći.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - automatski selektuje pakete od ponuđenog.\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 "  --test         - proverava da li se može izvesti ispravna instalacija.\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
@@ -894,17 +854,17 @@ msgstr ""
 "  --force        - primorava na invokaciju čak i ako neki paketi ne "
 "postoje.\n"
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - distribuirani urpmi preko mašina sa nadimkom.\n"
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --curl         - koristi još jedan root za rpm instalaciju.\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -913,72 +873,62 @@ msgstr ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to (un)install a chroot with --root option.\n"
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - verbose režim.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - izaberi sve pakete koji odgovaraju izrazu.\n"
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: nepoznata opcija \"-%s\", proverite upotrebu sa --help\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr "nepoznati paketi"
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "nepoznati paket"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "uklanjanje paketa %s će narušiti Vaš sistem"
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr "Nema ničega što bi se moglo ukloniti"
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "Proveravam kako bih uklonio sledeće pakete"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr "Radi zadovoljenja zavisnosti, sledeći paketi će biti uklonjeni (%d MB)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (d/N) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "uklanjam %s"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr "Uklanjanje nije uspelo"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Pogrešan izbor, probajte ponovo\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -994,39 +944,39 @@ msgstr ""
 "\n"
 "upotreba:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - koristi samo update medij.\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - koristi samo dati medij, odvojen zarezom.\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - ne koristi dati medij, odvojen zarezom.\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 "  --sortmedia    - sortira medije na osnovu podstringova odvojenih zarezom.\n"
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr "  --synthesis    - koristi dati synthesis umesto urpmi-jeve baze.\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  -verbose       - verbose režim.\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1037,87 +987,87 @@ msgstr ""
 "dat tag u komandi\n"
 "                   linija, nekompatibilna sa interaktivnim modom).\n"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --uniq         - ne prikazuje identične linije.\n"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all           - prikazuje sve tagove.\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group         - prikazuje tag grupe: grupa.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size          - prikazuje tag veličine: veličina.\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --size          - prikazuje tag veličine: veličina.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary       - prikazuje tag sažetka: sažetak.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description   - prikazuje tag opisa: opis.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr "  --sourcerpm    - prikazuje tag sourcerpm: source rpm.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr "  --packager     - prikazuje tag packager: packager.\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr "  --buildhost    - prikazuje tag buildhost: build host.\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --url          - prikazuje tag url: url.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr "  --provides      - prikazuje tag obezbeđuje: sve obezbeđuje.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr "  --requires      - prikazuje tag zahteva: svi zahtevi\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files         - prikazuje tag fajlove: sve fajlove.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr "  --conflicts     - prikazuje tag konflikata: svi konflikti.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr "  --obsoletes     - prikazuje tag višak: svi viškovi (u više reda).\n"
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
@@ -1126,24 +1076,24 @@ msgstr ""
 "  --env          - koristi specifično okruženje (tipično izveštaj o "
 "grešci).\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr "  -i             - ignoriše razliku u karakteru u bilo kojoj šemi.\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - prikazuje verziju, izdanje i arhitekturu, uključujući i "
 "ime.\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - uključuje perl kod direktno kao perl -e.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
@@ -1151,7 +1101,7 @@ msgstr ""
 "  -a             - inarni AND ooperator, istinit ukoliko su oba izraza "
 "istinita.\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
@@ -1159,22 +1109,22 @@ msgstr ""
 "  -o             - binarni OR operator, istinit ukoliko je jedan izraz "
 "tačan.\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - binarni NOT, istinit ukoliko je izraz pogrešan.\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr "  (              - leva zagrada za otovranje grupe izraza.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr "  )              - desna zagrada za zatvaranje grupe izraza.\n"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
@@ -1183,12 +1133,12 @@ msgstr ""
 "povratni je :\n"
 "%s\n"
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "koristim dato okruženje na %s\n"
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1203,19 +1153,19 @@ msgstr ""
 "Ovo je besplatan softver i može biti slobodno redistribuiran pod uslovima \n"
 "GNU i GPL. upotreba:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - koristi dati synthesis umesto urpmi-jeve baze podataka.\n"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - automatska izbor paketa da bi se ažurirao sistem.\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
@@ -1224,7 +1174,7 @@ msgstr ""
 "  --no-uninstall - nikada ne traži deinstalaciju paketa, obustavi "
 "instalaciju.\n"
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1234,7 +1184,7 @@ msgstr ""
 "zahtevani paket\n"
 "                   koji vodi uklanjanju.\n"
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1245,37 +1195,37 @@ msgstr ""
 "                   više paketa od datog broja,\n"
 "                   default je %d.\n"
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - mala dužina transakcije, osnovna postavka je %d.\n"
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - uzrokuje fuzzy pretragu (isto kao -y).\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - sledeći paket je izvorni paket (isto kao i  -s).\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - instalira samo pakete sa izvornim kodom.\n"
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean      - uklanja rpm iz keša pre bilo čega drugog.\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - čuva rpm koji nisu korišćeni u kešu.\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1285,7 +1235,7 @@ msgstr ""
 "bez\n"
 "                   provere međuzavisnosti paketa.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1295,7 +1245,7 @@ msgstr ""
 "bez\n"
 "                   provere međuzavisnosti i integriteta.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1304,22 +1254,22 @@ msgstr ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - koristi wget za dobavljanje udaljenih fajlova.\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - koristi curl za dobavljanje udaljenih fajlova.\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - limitira brzinu download-a.\n"
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, fuzzy, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1329,7 +1279,7 @@ msgstr ""
 "                   (--no-verify-rpm ne verigikuje, standardna je "
 "verifikacija).\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1339,7 +1289,7 @@ msgstr ""
 "pretpostavlja\n"
 "                   da je 1080 po default-u (format je <proxyhost[:port]>).\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1348,7 +1298,7 @@ msgstr ""
 "  --proxy-user   - određuje korisnika i lozinku koji se koriste za proxy\n"
 "                   autentifikaciju (format je <user:password>).\n"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1357,12 +1307,12 @@ msgstr ""
 "  --bug          - pravi izveštaj o grešci u direktorijumu prosleđenom "
 "kao                      sledeći argument.\n"
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - koristi X interfejs.\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1371,7 +1321,7 @@ msgstr ""
 "  --best-output  - bira najbolji interfejs shodno okruženju:\n"
 "                   X ili tekstualni mod.\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1381,78 +1331,67 @@ msgstr ""
 "                   (--no-verify-rpm ne verigikuje, standardna je "
 "verifikacija).\n"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - isključuje putanju razdvojenu zarezom.\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - isključuje docs fajlove.\n"
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - bira sva poklapanja u komandnoj liniji.\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 "  -p            - dozvoljava pretraživanje po pružanju radi nalaženja "
 "paketa.\n"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - ne pretražuje dostupne radi nalaženja paketa.\n"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - uzrokuje fuzzy pretragu (kao i  --fuzzy).\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 "  -s             - sledeći paket je izvorni paket (isto kao i  --src).\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - tihi režim (malo poruka).\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  imena ili rpm fajlovi dati u komandnoj liniji će biti instalirani.\n"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr ""
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "loša proxydeklaracija u komandnoj liniji\n"
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: nepoznata opcija \"-%s\", proverite upotrebu sa --help\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 "Šta se može učiniti sa binarnim rpm paketima kada se koristi opcija --"
 "install-src"
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1465,22 +1404,22 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "Ne radi ništa"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr ""
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr ""
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1490,12 +1429,12 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, fuzzy, c-format
 msgid "Install it"
 msgstr "Instalacija nije uspela"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1504,42 +1443,42 @@ msgstr ""
 "Direktorijum  [%s] već postoji, izaberite drugi direktorijum za "
 "prijavljivanje bagova ili ga izbrišite"
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "ne mogu da napravim direktorijum [%s] za izveštaj o grešci"
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Samo administrator može da instalira pakete"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "Jedan od sledećih paketa je potreban da bi instalirali %s:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Potreban(i) su sledeći paket(i):"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Šta želite? (1-%d) "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "Instalacija paketa..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "pokrećem..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1548,12 +1487,12 @@ msgstr ""
 "Neki izabrani paketi se ne mogu instalirati:\n"
 "%s"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr "da li se slažete?"
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1564,7 +1503,7 @@ msgstr ""
 "moraju biti uklonjeni da bi ostali mogli da se ažuriraju:\n"
 "%s\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1573,15 +1512,15 @@ msgstr ""
 "Sledeći paketi se moraju ukloniti da bi drugi mogli da budu ažurirani:\n"
 "%s"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
 "Radi zadovoljenja zavisnosti, sledeći paketi će biti instalirani (%d MB)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1590,37 +1529,47 @@ msgstr ""
 "Morate da imate root ovlašćenja da bi instalirali sledeće pakete:\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "izvor paketa nije dostupan, izlazim..."
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Ubacite medij sa imenom %s u uređaj [%s]"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Pritisnite enter kada budete spremni..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Skidam paket `%s'..."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% za %s završeno, vreme do kraja = %s, brzina = %s"
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% završeno, brzina = %s"
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Sledeći paketi imaju neispravne potpise"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Da li želite da nastavite konfiguraciju ?"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1631,57 +1580,57 @@ msgstr ""
 "%s\n"
 "Možda želite da ažurirate vašu urpmi bazu podataka."
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "Instalacija nije uspela"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr "distribuiram %s"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr "Instaliram %s"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instaliram paket `%s' (%s/%s)..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Instaliacija bez provere zavisnosti (da/Ne)? "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Prisilna instalacija (--force)? (da/Ne) ?"
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d instlaciona transakcija nije uspela"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "Instalacija je moguća"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "sve je već instalirano"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr "restartujem urpmi"
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1705,22 +1654,22 @@ msgstr ""
 "\n"
 "       removable://<putanja>\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - kreira update medij.\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr "  --probe-synthesis - pokušava da pronađe i koristi synthesis fajl.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr "  --probe-hdlist - pokušava da pronađe i koristi hdlist fajl.\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
@@ -1729,7 +1678,7 @@ msgstr ""
 "  --no-probe     - ne pokušava da pronađe bilo koji synthesis ili\n"
 "                   hdlist fajl.\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -1738,7 +1687,7 @@ msgstr ""
 "  --distrib      - automatski napravi sve medije sa instalacionog\n"
 "                    medija.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1750,7 +1699,7 @@ msgstr ""
 "                     nadogradnja ili blio šta drugo što može da se "
 "podesi ;-)\n"
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1759,7 +1708,7 @@ msgstr ""
 "  --form        - koristi datu url adresu za list mirora, podrazumevano je\n"
 "                    %s\n"
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1770,7 +1719,7 @@ msgstr ""
 "                   iz verzije distribucije koja je navedena u\n"
 "                   deinstaliranom mandrake-release paketu.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
@@ -1779,7 +1728,7 @@ msgstr ""
 "  --arch       - koristi datu arhitekturu, podrazumevanoa je arhitektura\n"
 "                    instaliranog Mandrake paketa.\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
@@ -1788,73 +1737,52 @@ msgstr ""
 "  --virtual      - kreira virtuelni medij koji su uvek ažurirani ,\n"
 "                   dozvoljen je samo fajl:// protocol.\n"
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - deaktivira MD5SUM proveru fajla.\n"
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - čisti direktorijum sa kešom nadglavlja.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - primorava na generisanje hdlist fajlova.\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"nepoznate opcije '%s'\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "ne mogu da dodam nadogradnje cooker distribuciji\n"
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "dobavljam mirore na %s ..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"nedostaje <relativna putanja hdlist> sa --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "nedostaje <relativna putanja hdlist> sa --distrib"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "ne mogu da ažuriram medij \"%s\"\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"nedostaje <relativna putanja hdlist>\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "nedostaje <relativna putanja hdlist>\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"`sa nedostatkom za mrežni ftp medij\n"
+msgid "`with' missing for network media\n"
+msgstr "`sa nedostatkom za mrežni ftp medij\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "ne mogu da kreiram medij \"%s\"\n"
@@ -1873,6 +1801,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - selektuje sve medije.\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"nepoznate opcije '%s'\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1887,7 +1824,7 @@ msgstr ""
 "nedostaje unos za brisanje\n"
 "(jedan od %s)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1896,28 +1833,28 @@ msgstr ""
 "upotreba: urpmi.update [opcije] <ime> ...\n"
 "gde <ime> jeste ime medija za ažuriranje.\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - ažuriraj samo medijum za ažuriranje.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr "  --force-key    - primorava na ažuriranje gpg ključa.\n"
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - selektuje sve ne prenosive medije.\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "nema ničega za ažuriranje (koristi urpmi.addmedia za dodavanje medija)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1926,7 +1863,7 @@ msgstr ""
 "nedostaje unos za ažuriranje\n"
 "(jedan od %s)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1942,41 +1879,41 @@ msgstr ""
 "\n"
 "upotreba:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - prikazuje listu paketa.\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media         - prikazuje listu medija.\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-media         - prikazuje listu medija i ljihov url.\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 "  --list-nodes         - prikazuje listu čvorova pri korišćenju opcije --"
 "parallel.\n"
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases         - prikazuje listu paralelnih alijasa.\n"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
@@ -1985,14 +1922,14 @@ msgstr ""
 "  --headers      - ekstraktuje hedere za pakete prikazane iz urpmi db na\n"
 "                   stdout (samo root).\n"
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 "  --sources      - prikazuje sve izvorne pakete pre download-a (samo root).\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
@@ -2001,17 +1938,17 @@ msgstr ""
 "  --use-distrib  - podešava urpmi u letu sa distrib stabla.\n"
 "                   Ova opcija dozvoljava ispitivanje distribucije.\n"
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - prikazuje log sa izmenama.\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - proširuje pretragu na zavisnost paketa.\n"
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -2020,59 +1957,112 @@ msgstr ""
 "  -u             - uklanja pakete ukoliko je novija verzija već "
 "instalirana.\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c              - potpun izlaz sa paketom koji treba da se ukloni.\n"
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - pretraga unazad za onim što zahteva paket.\n"
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 "  -i             - prikazje korisne informacije u, za ljude čitljivnom "
 "obliku.\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - prikazuje grupe uključujući i ime.\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - prikazuje verziju uključujući i ime.\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - prikazuje fajlove u paketu.\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 "  imena ili rpm fajlovi koji su dati u komandnoj liniji se proveravaju.\n"
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: nepoznata opcija \"-%s\", proverite upotrebu sa --help\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: ne mogu da pročitam rpm datoteku \"%s\"\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "  --list-nodes se može koristiti samo sa opcijom --parallel"
 
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "Nepoznati webfetch `%s' !!!\n"
+
+#~ msgid "copy failed: %s"
+#~ msgstr "kopiranje neuspelo: %s"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "nedostaje wget\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "wget nije uspeo: izašao sa %d ili signalom %d\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "nedostaje curl\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "curl nije uspeo: izašao sa %d ili signalom  %d\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "nedostaje rsync\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "rsync nije uspeo: izašao sa %d ili signal %d\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "nedostaje ssh\n"
+
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmi: nepoznata opcija \"-%s\", proverite upotrebu sa --help\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmi: nepoznata opcija \"-%s\", proverite upotrebu sa --help\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr ""
+#~ "Radi zadovoljenja zavisnosti, sledeći paketi će biti instalirani (%d MB)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "nedostaje <relativna putanja hdlist> sa --distrib"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "nedostaje <relativna putanja hdlist>\n"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "`sa nedostatkom za mrežni ftp medij\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmq: nepoznata opcija \"-%s\", proverite upotrebu sa --help\n"
+
 #~ msgid "no webfetch (curl or wget currently) found\n"
 #~ msgstr "webfetch (trenutno surl ili wget) nije pronađen\n"
 
diff --git a/po/sv.po b/po/sv.po
index 64e322f7..f5bde664 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-sv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2004-03-27 11:05+0100\n"
 "Last-Translator: Kenneth Krekula <kenneth.krekula@kiruna.se>\n"
 "Language-Team:  <sv@li.org>\n"
@@ -63,22 +63,22 @@ msgstr ""
 "Automatisk installation av paket.\n"
 "Du begärde installation av paketet %s\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "Är det OK?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (J/n) "
@@ -88,7 +88,7 @@ msgstr " (J/n) "
 msgid "%s: command not found\n"
 msgstr "%s: kommandot kunde inte hittas\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
@@ -97,115 +97,54 @@ msgstr ""
 "användning: %s [flaggor]\n"
 "där [flaggor] är från\n"
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - visar det här hjälpmeddelandet.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "   -g [group]     - begränsa resultat till aktuell grupp.\n"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, c-format
 msgid "                    defaults is %s.\n"
 msgstr "                    default är %s.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Okänd webbhämtare \"%s\".\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "okänt protokoll definierat för %s"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "ingen 'webfetch' hittad, supportad webfetch är: %s\n"
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "kan inte hantera protokoll: %s"
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "kopiering misslyckades: %s"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "wget saknas\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget misslyckades: avslutade med %d eller signal %d\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "curl saknas\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl misslyckades: avslutade med %d eller signal %d\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "rsync saknas\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "rsync misslyckades: avslutade med %d eller signal %d\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "SSH saknas\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% av %s klart ETA=%s, hastighet=%s"
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% klart, hastighet=%s"
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...hämtning misslyckades: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "syntaxfel i inställningsfil på rad %s"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 "media \"%s\" försöker använda en hdlist som redan används, media ignorerat"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 "media \"%s\" försöker använda en lista som redan används, media ignorerat"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -214,38 +153,38 @@ msgstr ""
 "kan ej använda media \"%s\" eftersom listfilen redan används av ett annat "
 "media"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 "kan inte använda namn \"%s\" för namnlöst media eftersom det redan används"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr "Kan ej behandla media \"%s\" eftersom ingen fillista [%s] existerar"
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "kan inte avgöra media för den här hdlist-filen [%s]"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "kunde inte komma åt hdlist-fil för \"%s\", media ignorerat"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "kunde inte komma åt listfil för \"%s\", media ignorerat"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "försöker gå förbi befintligt media \"%s\", undviker"
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -254,92 +193,92 @@ msgstr ""
 "virutellt media \"%s\" bör inte ha en hdlist eller listfil definierad, media "
 "ignorerat"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "virtuellt media \"%s\" bör ha en tydlig URL, media ignorerat"
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "kunde inte hitta hdlist-fil för \"%s\", media ignorerat"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "kunde inte hitta listfil för \"%s\", media ignorerat"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "Felaktiv listfil för \"%s\", ignorerar media"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "kunde inte inspektera listfil för \"%s\", media ignorerat"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "för många monteringspunkter för flyttbar media \"%s\""
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "tar flyttbar enhet som \"%s\""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "använder annan flyttbar enhet [%s] för \"%s\""
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "Kunde inte hämta sökväg för flyttbart media \"%s\""
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "kan inte skriva inställningsfil [%s]"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "skriv inställningsfil [%s]"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "Kan ej använda parallellt läge med use-distrib läge"
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "kan inte tyda \"%s\" i fil [%s]"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "undersöker parallell hanterare i fil [%s]"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "hittade parallella hanterare för noder: %s"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "använder associerad media för parallelläge: %s"
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "kan inte använda parallellalternativ \"%s\""
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -348,90 +287,90 @@ msgstr ""
 "--synthesis kan inte användas med --media, --excludemedia, --sortmedia, -- "
 "update eller --parallel"
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "undersöker synthesis-fil [%s]"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "undersöker hdlist-fil [%s]"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "Virtuellt media \"%s\" är inte tillgängligt lokalt, ignorerar media"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "problem med att läsa hdlist- eller synthesis-fil för media \"%s\""
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "utför andra passet för att räkna ut beroenden\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "hoppar över paket %s"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "skulle installera istället för att uppdatera paket %s"
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "kunde inte öppna RPM-db"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "media \"%s\" finns redan"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr "virtuell media måste vara lokal"
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "lade till media %s"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "kan inte komma åt det första installationsmediat"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "kopierar hdlist-fil..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "...kopiering misslyckades"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "...kopiering klar"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
@@ -440,43 +379,49 @@ msgstr ""
 "kan inte läsa det första installationsmediumet (hittade ingen Mandrake/base/"
 "hdlists-fil)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "hämtar hdlist-fil..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "...hämtning klar"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...hämtning misslyckades: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "ogiltig hdlist-beskrivning \"%s\" i hdlist-fil"
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "försöker välja media som inte finns \"%s\""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "väljer flera media: %s"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "tar bort media \"%s\""
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -487,7 +432,7 @@ msgstr ""
 "detta kan hända om du manuellt monterade katalogen när du skapade detta "
 "media."
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -496,222 +441,222 @@ msgstr ""
 "Virtuellt media \"%s\" bör ha giltig hdlist- eller synthesis-källa, media\n"
 "ignorerat"
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "kopierar beskrivningsfil för \"%s\"..."
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "Beräknar MD5-summa för existerande hdlist- (eller synthesis) källa"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "undersöker MD5SUM-fil"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "kopierar käll-hdlist (eller synthesis) för \"%s\"..."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "kopiering av [%s] misslyckades (filen är misstänkligt liten)"
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "Beräknar MD5-summa för kopierad käll-hdlist (eller synthesis)"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "kopiering av [%s] misslyckades (md5sum stämmer inte)"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "problem med att läsa synthesis-fil för media \"%s\""
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "läser RPM-filer från [%s]"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "kan inte läsa RPM-filer från [%s]: %s"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "inga RPM-filer hittade från [%s]"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "hämtar käll-hdlist (eller synthesis) för \"%s\"..."
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "hittat undersökt hdlist (eller synthesis) som %s"
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "beräknar MD5-summa för hämtade hdlist- (eller syntheses) källor"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr "felaktig MD5-summa"
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "hämtning av käll-hdlist (eller synthesis) misslyckades"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "ingen hdlist-fil hittad för media \"%s\""
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "filen [%s] används redan i samma media \"%s\""
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "kunde ej tyda hdlist-fil för \"%s\""
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "kunde inte skriva listfil för \"%s\""
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "skriver listfil för media \"%s\""
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "ingenting skrivet i listfilen för \"%s\""
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "undersöker \"pubkey\"-fil för \"%s\"..."
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...importerarde nyckel %s från \"pubkey\"-fil av \"%s\""
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "kunde inte importera \"pubkey\"-fil för \"%s\""
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "läser huvuden från media \"%s\""
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "bygger hdlist [%s]"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "bygg dhlist synthesis fil för media \"%s\""
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "hittade %d huvuden i cachen"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "tar bort %d inaktuella huvuden i cache"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "monterar %s"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "avmonterar %s"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "relokerade %s poster i depslist"
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "inga poster relokerade i depslist"
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "ogiltigt RPM-filnamn [%s]"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "hämtar RPM-fil [%s]..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "kan inte läsa rpm-fil [%s]"
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "kan inte registrera RPM-fil"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "fel vid registrering av lokala paket"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "inget paket med namn %s"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Följande paket innehåller %s: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "det finns flera paket med samma RPM-filnamn \"%s\""
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "kunde inte tyda [%s] på värde \"%s\""
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -720,62 +665,62 @@ msgstr ""
 "Media \"%s\" använder en ogiltig listfil:\n"
 "  spegeln är antagligen inaktuell, försök använda en alternativ metod"
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "media \"%s\" definierar inte någon plats för RPM-filer"
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "paketet %s hittas inte."
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi-databas låst"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "mediat \"%s\" är inte valt"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "kunde inte läsa RPM-fil [%s] från media \"%s\""
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "Felkonfigurerat media \"%s\" är markerat som flyttbart men är inte det"
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "kunde inte komma åt media \"%s\""
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "felaktig inmatning: [%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "hämtar RPM-filer från media \"%s\"..."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "Förbereder..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "använder process %d för exekvering av transaktion"
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -783,82 +728,97 @@ msgstr ""
 "skapade transaktion för installation på %s (ta bort=%d, installera=%d, "
 "uppdatera=%d)"
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr "kunde inte skapa transaktion"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "tar bort paket %s"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "kan inte ta bort paket %s"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "lägger till paket %s (id=%d, eid=%d, uppdatera=%d, fil=%s)"
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "kan inte installera paket %s"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "för att %s saknas"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "på grund av otillräckliga %s"
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr "försöker befordra %s"
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr "för att behålla %s"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "för att installera %s"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "på grund av konflikter med %s"
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr "obegärd"
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Ogiltig signatur (%s)"
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "Ogiltigt nyckel-id (%s)"
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Signatur saknas (%s)"
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "felaktig proxydeklaration på kommandorad\n"
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: kan inte läsa rpm-fil \"%s\"\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Felaktigt val, försök igen.\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -874,40 +834,40 @@ msgstr ""
 "\n"
 "användning:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - visar det här hjälpmeddelandet.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - välj automatiskt ett paket från valen.\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr "  --test         - verifiera om installationen kan utföras korrekt.\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - tvinga användning även om vissa paket inte finns.\n"
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - distribuerad urpmi över alla maskiner med alias.\n"
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - använd en annan root för rpm installation.\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -917,73 +877,63 @@ msgstr ""
 "distributionsträd, användbart\n"
 "                   vid (av)installation av chroot med --root option.\n"
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - utförligt läge.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - välj alla paket som matchar uttryck.\n"
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: okänd flagga \"-%s\", använd --help för hjälp\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr "okända paket"
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "okänt paket"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "att ta bort paketet %s skulle förstöra systemet"
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr "Ingenting att ta bort"
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "Kontrollerar för att ta bort följande paket"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
 "För att tillfredsställa beroenden kommer följande paket att tas bort (%d MB)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (j/N) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "tar bort %s"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr "Borttagning misslyckades"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Felaktigt val, försök igen.\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -999,40 +949,40 @@ msgstr ""
 "\n"
 "användning:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - använd endast uppdateringsmedia.\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media         - använd endast givet media, separerat med komma.\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 "  --excludemedia         - använd inte givet media, separerat med komma.\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 "  --sortmedia    - sorterar media enligt kommaseparerade delsträngar.\n"
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr "  --synthesis    - använd given synthesis istället för urpmi db.\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose             - utförligt läge.\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1043,88 +993,88 @@ msgstr ""
 "kommando-\n"
 "                   raden, ej kompatibelt med interaktivt läge).\n"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --uniq         - visa inte identiska rader.\n"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all           - visa alla taggar.\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group         - visa taggen \"group\": grupp.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size          - visa taggen \"size\": storlek.\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --epoch        - visa taggen \"epoch\": epoch.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary       - visa taggen \"summary\": sammanfattning.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description   - visa taggen \"description\": beskrivning.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr "  --sourcerpm    - visa taggen \"sourcerpm\": käll-RPM.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr "  --packager     - visa taggen \"packager\": paketerare.\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr "  --buildhost    - visa taggen \"buildhost\": byggdator.\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --url         - visa taggen \"url\": url.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr ""
 "  --provides      - visa taggen \"provides\": allt som tillhandahålls.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr "  --requires      - visa taggen \"requires\": allt som krävs.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files         - visa taggen \"files\": alla filer.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr "  --conflicts     - visa taggen \"conflicts\": alla konflikter.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr "  --obsoletes     - visa taggen \"obsoletes\": alla inaktuella.\n"
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
@@ -1133,51 +1083,51 @@ msgstr ""
 "  --env          - använd specifik miljö (vanligen en\n"
 "                 felrapport).\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
 "  -i             - versaler och gemener jämförs lika i varje mönster.\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - visa version, utgåva och arkitektur med namn.\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - inkludera perl-kod direkt som perl -e.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 "  -a             - binär AND operator, sant om båda uttrycken är sanna.\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
 msgstr "  -o             - binär OR operator, sant om ett uttryck är sant.\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - unär NOT, sant om uttycket är falskt.\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr "  (              - vänster parentes för att öppna grupputtryck.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr "  )              - höger parentes för att stänga grupputtryck.\n"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
@@ -1186,12 +1136,12 @@ msgstr ""
 "återanrop är:\n"
 "%s\n"
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "använder specifik miljö på %s\n"
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1207,19 +1157,19 @@ msgstr ""
 "\n"
 "användning:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - använd given synthesis istället för urpmi db.\n"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 "  --auto-select  - välj automatiskt paket för att uppdatera systemet.\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
@@ -1228,7 +1178,7 @@ msgstr ""
 "  --no-uninstall - fråga aldrig om ett paket ska avinstalleras, avbryt "
 "installationen.\n"
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1238,7 +1188,7 @@ msgstr ""
 "efterfrågade \n"
 "                   paket som leder till avinstalleringar.\n"
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1249,38 +1199,38 @@ msgstr ""
 "                   kommer att installeras eller uppdateras,\n"
 "                   förvalt alternativ är %d\n"
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 "  --split-length - liten transaktionslängd, förvalt alternativ är %d.\n"
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - kräv luddig sökning (samma som -y).\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - nästa paket är ett källpaket (samma som -s).\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - installera endast källpaket (inga binärer).\n"
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean      - ta bort rpm från cache före allt annat.\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - behåll rpm som inte används i cache.\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1289,7 +1239,7 @@ msgstr ""
 "  --allow-nodeps - tillåter användaren installera paket utan\n"
 "                   att kontrollera beroenden.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1298,7 +1248,7 @@ msgstr ""
 "  --allow-force  - tillåter användaren att installera paket utan\n"
 "                   kontroll av beroenden och integritet.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1308,22 +1258,22 @@ msgstr ""
 "distributionsträd, användbart\n"
 "                   vid installation av chroot med --root option.\n"
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - använd wget för att hämta fjärrfiler.\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - använd curl för att hämta fjärrfiler.\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - begränsa nedladdningshastigheten.\n"
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1332,7 +1282,7 @@ msgstr ""
 "  --resume       - återuppta nedladdning av delvis nedladdade filer\n"
 "                   (--no-resume inaktiverar det, standard är inaktiverat).\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1342,7 +1292,7 @@ msgstr ""
 "                   vara 1080 som standard (formatet är <proxydator[:port]"
 ">).\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1351,7 +1301,7 @@ msgstr ""
 "  --proxy-user   - ange användare och lösenord för proxy-\n"
 "                   autentisering (formatet är <användare:lösenord>).\n"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1360,12 +1310,12 @@ msgstr ""
 "  --bug          - mata ut en felrapport i katalogen som indikeras av\n"
 "                nästa arg.\n"
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - använd X-gränssnitt.\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1374,7 +1324,7 @@ msgstr ""
 "  --best-output  - välj det bästa gränssnittet enligt miljön:\n"
 "                   X eller textläge.\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1384,74 +1334,63 @@ msgstr ""
 "                     (--no-verify-rpm inaktiverar det, standard är "
 "aktiverat).\n"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - ignorera sökväg separerad av komma.\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - exkludera dokumentfiler.\n"
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - välj alla träffar på kommandoraden.\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 "  -p             - tillåt sökning i \"provides\" för att hitta paket.\n"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - sök inte i \"provides\" för att hitta paket.\n"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - kräv luddig sökning (samma som --fuzzy).\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s             - nästa paket är ett källpaket (samma som --src).\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - tyst läge.\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  namn eller rpm-filer som anges på kommandoraden installeras.\n"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr "Välj var filen ska sparas"
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "felaktig proxydeklaration på kommandorad\n"
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: okänd flagga \"-%s\", använd --help för hjälp\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr "Vad kan göras med binära RPM-filer när -install-src används"
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1472,22 +1411,22 @@ msgstr ""
 "\n"
 "Vad vill du göra?"
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "Gör ingenting"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr "Ja, installera paketet"
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr "Spara fil"
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1502,12 +1441,12 @@ msgstr ""
 "\n"
 "Kanske föredrar du att endast spara detta. Vilket är ditt val?"
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, c-format
 msgid "Install it"
 msgstr "Installera det"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1516,42 +1455,42 @@ msgstr ""
 "Katalogen [%s] finns redan, välj en annan katalog för felrapport eller "
 "radera den"
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Kunde inte skapa katalog [%s] för felrapport"
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Endast systemadministratörer får installera paket"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "Ett av följande paket är nödvändigt för att installera %s:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Ett av följande paket är nödvändigt:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Vad är ditt val? ( 1-%d) "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "Paketinstallation..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "Initierar..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1560,12 +1499,12 @@ msgstr ""
 "Vissa begärda paket kan inte installeras:\n"
 "%s"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr "accepterar du?"
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1576,7 +1515,7 @@ msgstr ""
 "tas bort så att andra kan uppdateras:\n"
 "%s\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1585,16 +1524,16 @@ msgstr ""
 "Följande paket måste tas bort för att andra ska bli uppdaterade:\n"
 "%s"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
 "För att tillfredsställa beroenden kommer följande paket att installeras (%d "
 "MB)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1603,37 +1542,47 @@ msgstr ""
 "Du måste vara root för att kunna installera följande beroenden:\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "kunde inte läsa källan, avbryter"
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Lägg i media med namnet \"%s\" i enhet [%s]"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Tryck \"Enter\" vid klart..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Laddar ner paket \"%s\"..."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% av %s klart ETA=%s, hastighet=%s"
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% klart, hastighet=%s"
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Följande paket har felaktiga signaturer"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Vill du fortsätta installationen?"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1644,57 +1593,57 @@ msgstr ""
 "%s\n"
 "Du bör försöka uppdatera urpmi-databasen."
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "Installationen misslyckades"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr "distribuerar %s"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr "installerar %s"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Installerar paket \"%s\" (%s/%s)..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Prova att installera utan att kontrollera behov av andra filer? (j/N) "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Försöka ännu hårdare att installera (--force)? (j/N)"
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d installationstransaktioner misslyckades"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "Installation är möjlig"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "allt är redan installerat"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr "startar om urpmi"
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1720,22 +1669,22 @@ msgstr ""
 "\n"
 "och [flaggor] är från\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - skapa ett uppdateringsmedia.\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr "  --probe-synthesis - försök hitta och använda synthesis fil.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr "  --probe-hdlist - försök att hitta och använda hdlist-fil.\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
@@ -1744,7 +1693,7 @@ msgstr ""
 "  --no-probe     - försök ej hitta någon synthesis- eller\n"
 "                   hdlist-fil.\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -1753,7 +1702,7 @@ msgstr ""
 "  --distrib      - skapa automatiskt all media från ett\n"
 "                 installationsmedia.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1765,7 +1714,7 @@ msgstr ""
 "uppdateringar eller\n"
 "                   någonting annat som har blivit inställt.\n"
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1775,7 +1724,7 @@ msgstr ""
 "standard är\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1786,7 +1735,7 @@ msgstr ""
 "                   hämtas från distributionens version som talas om av\n"
 "                   det installerade paketet mandrake-release.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
@@ -1795,7 +1744,7 @@ msgstr ""
 "  --arch         - använd specificerad arkitektur, förvalt är arkitekturen\n"
 "                   i installerat mandrake-release-paket.\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
@@ -1804,73 +1753,52 @@ msgstr ""
 "  --virtual      - skapa virtuellt media som alltid är uppdaterat, endast\n"
 "                   fil://-protokoll är tillåtet.\n"
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    -inaktivera md5sum-kontroll av filer.\n"
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - rensa huvudcachekatalogen.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - tvinga generering av hdlist-filer.\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"okända flaggor \"%s\"\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "kan inte lägga till uppdateringar från en cooker-distribution\n"
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "hämtar speglar på %s ..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"behöver inte ange <relativ sökväg till hdlist> med --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "behöver inte ange <relativ sökväg till hdlist> med --distrib"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "kunde ej uppdatera media \"%s\"\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"<relativ sökväg till hdlist> saknas\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<relativ sökväg till hdlist> saknas\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"\"with\" saknas för nätverksmedia\n"
+msgid "`with' missing for network media\n"
+msgstr "\"with\" saknas för nätverksmedia\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "kunde inte skapa media \"%s\"\n"
@@ -1889,6 +1817,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - välj all media.\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"okända flaggor \"%s\"\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1903,7 +1840,7 @@ msgstr ""
 "objektet som ska tas bort saknas\n"
 "(en av %s)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1912,27 +1849,27 @@ msgstr ""
 "användning: urpmi.update [flaggor] <namn>...\n"
 "där <namn> är medianamnet som ska uppdateras.\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - uppdatera endast uppdateringsmedia.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr "  --force-key    - tvinga uppdatering av gpg-nyckel.\n"
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - välj all icke-flyttbar media.\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "inget att uppdatera (använd urpmi.addmedia för att lägga till media)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1941,7 +1878,7 @@ msgstr ""
 "objektet som ska uppdateras saknas\n"
 "(en av %s)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1957,40 +1894,40 @@ msgstr ""
 "\n"
 "användning:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list           - visa tillgängliga paket.\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   -   visa tillgänglig media.\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - lista tillgänglig media och dess sökväg.\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 "  --dump-config  - dumpa konfigurationen i form av urpmi.addmedia argument.\n"
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 "  --list-nodes   - visa tillgängliga noder vid användning av --parallel.\n"
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - lista tillgängliga parallellalias.\n"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
@@ -1999,13 +1936,13 @@ msgstr ""
 "  --headers      - packa upp huvuden för paket från urpmi-db till\n"
 "                   standard ut (endast root).\n"
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr "  --sources      - ge alla källpaket före nedladdning (endast root).\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
@@ -2015,18 +1952,18 @@ msgstr ""
 "distributionsträd.\n"
 "                   Detta tillåter kontroll av distribution.\n"
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - skriv ut ändringsloggen (changelog).\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 "  -d             - utöka förfrågning till att omfatta paketberoenden.\n"
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -2034,55 +1971,109 @@ msgid ""
 msgstr ""
 "  -u             - ta bort paket om en nyare version redan är installerad.\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 "  -c             - fullständig utmatning med paketet som ska tas bort.\n"
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - omvänd sökning för vad som krävs av paket.\n"
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 "  -i             - visa användbar information i en för människan läsbar "
 "form.\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - visa grupper med namn.\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - visa version och utgåva med namn.\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - lista filerna i paketet.\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  namn eller rpm-filer som anges på kommandoraden förfrågas.\n"
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: okänd flagga \"-%s\", använd --help för hjälp\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: kan inte läsa rpm-fil \"%s\"\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes kan endast användas med --parallel"
+
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "Okänd webbhämtare \"%s\".\n"
+
+#~ msgid "copy failed: %s"
+#~ msgstr "kopiering misslyckades: %s"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "wget saknas\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "wget misslyckades: avslutade med %d eller signal %d\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "curl saknas\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "curl misslyckades: avslutade med %d eller signal %d\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "rsync saknas\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "rsync misslyckades: avslutade med %d eller signal %d\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "SSH saknas\n"
+
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpme: okänd flagga \"-%s\", använd --help för hjälp\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmi: okänd flagga \"-%s\", använd --help för hjälp\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr ""
+#~ "För att tillfredsställa beroenden kommer följande paket att installeras (%"
+#~ "d MB)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "behöver inte ange <relativ sökväg till hdlist> med --distrib"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "<relativ sökväg till hdlist> saknas\n"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\"with\" saknas för nätverksmedia\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmq: okänd flagga \"-%s\", använd --help för hjälp\n"
diff --git a/po/tg.po b/po/tg.po
index 2c93e0e7..2be9c971 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-tg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2004-03-28 00:04+0500\n"
 "Last-Translator: Tolib Marupov <tolibm@yahoo.com> \n"
 "Language-Team:  Tajik\n"
@@ -54,22 +54,22 @@ msgstr ""
 "Коргузориши автоматикии қуттиҳо...\n"
 "Шумо коргузориши куттии '%s'-ро талаб кардед\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "Ин дуруст аст?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Бекор кардан"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (Ҳ/н) "
@@ -79,7 +79,7 @@ msgstr " (Ҳ/н) "
 msgid "%s: command not found\n"
 msgstr "%s: фармон ёфта нашуд\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
@@ -88,117 +88,56 @@ msgstr ""
 "истифодабари: %s [хосиятҳо]\n"
 "аз куҷо [хосиятҳо]\n"
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - чопи ин пайғоми ёрӣ.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "   -g [group]     - маҳдудкунии натиҷа ё гурӯҳи додашуда.\n"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, c-format
 msgid "                    defaults is %s.\n"
 msgstr "                    бо нобаёнӣ %s.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "webfetch-и номаълум `%s' !!!\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "барои %s протоколи номуаяйн муқаррар шудааст"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "webfetch пайдо нагардид, webfetch пуштибонӣ мегардад: %s\n"
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "даста кардани қарордод номумкин: %s"
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "нусхабардорӣ нагузашт: %s"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "wget вуҷуд надорад\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget аз кор баромад бо %d ё бо ишораи %d\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "curl вуҷуд надорад\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl нуқсон дорад: тамом шуд бо %d ё бо ишорати %d\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "rsync мавҷуд нест\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "rsync аз фаъолият баромад: тамом шуд бо %d ё бо ишораи %d\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "ssh мавҷуд нест\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% аз они %s тамом шуд, ETA = %s, суръат = %s"
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% ба охир расид, суръат = %s"
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...барқароркунӣ нагузашт: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "хатогии таркибӣ дар сатри %s дар файли танзимдарор"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 "миёнаи \"%s\" кӯшиши истифодаи hdlist-и аллакай истифодашуда дорад, миёна "
 "рад шуд"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 "миёнаи \"%s\" кӯшиши истифодаи рӯйхати аллакай истифодашуда дорад, миёна рад "
 "шуд"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -207,41 +146,41 @@ msgstr ""
 "аз паи муҳити \"%s\" шудан номумкин чунки файли рӯйхат аллакай бо муҳити "
 "дигар истифода шудааст"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 "истифодаи номи \"%s\" барои муҳити беном номумкин, ин ном аллакай истифода "
 "шудааст"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 "гирифтани муҳити \"%s\" ба ҳисобот аз барои вуҷуд надоштани рӯйхати файли [%"
 "s] номумкин"
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "муайян кардани муҳити ин файли hdlist-и [%s] номумкин"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "дохилшавии файли hdlist-и \"%s\" номумкин, муҳит рад шуд"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "дохилшавии файли рӯйхати \"%s\" номумкин, муҳит рад шуд"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "кӯшиши гузаштани муҳити вуҷуддоштаи \"%s\", кандашавӣ"
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -250,185 +189,185 @@ msgstr ""
 "сарчашмаи маҷозӣ \"%s\"на бояд файли муайяни hdlist ё файли рӯйхатиродошта "
 "бошад, сарчашма ба эътибор гирифта намешавад"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr ""
 "сарчашмаи маҷозӣ \"%s\" бояд url-и холӣ дошта бошад, сарчашма эътиборнадорад"
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "ёфтани файли hdlist барои \"%s\" номумкин, муҳит рад шуд"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "дарёфти файли рӯйхат барои \"%s\" номумкин, муҳит рад шуд"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "файли рӯйхати бемуносибат барои \"%s\", муҳит рад шуд"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
 "аз назар гузаронидани файли рӯйхат барои \"%s\" номумкин, муҳит рад шуд"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "нуқтаи васлкунии хеле зиёд барои миёнаи хориҷшаванда \"%s\""
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "қабули дастгоҳи хориҷшаванда ҳамчун \"%s\""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "истифодаи дигар дастгоҳи хориҷшавандаи [%s] барои \"%s\""
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "барқарори номироҳ барои миёнаи хориҷшаванда \"%s\""
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "навиштани файли танзимдарории [%s] номумкин"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "файли танзимдарории [%s] нависед"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "Усули параметрҳоро бо усули use-distrib якҷоя истифода бурда намешавад"
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "таҷзияи \"%s\" дар файли [%s] номумкин"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "санҷидани дастгузори параллел дар файли [%s]"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "дастгузори параллел ёфт шуд барои гиреҳҳо: %s"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "барои навъи параллелӣ расонаи вобасташуда истифода мешавад: %s"
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "истифодабарии хосияти параллели \"%s\" номумкуин"
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
 "update or --parallel"
 msgstr "--synthesis бо --media, --update ё --parallel истифода бурда намешавад"
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "санҷидани файли synthesis [%s]"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "санҷидани файли hdlist [%s]"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr ""
 "сарчашмаи маҷозӣ \"%s\"маҳаллӣ нест, сарчашма ба эътибор гирифта намешавад"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "муаммои хондани файли hdlist ё файли сарчашмаи synthesis \"%s\""
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "роҳи дуюми ҳисоби вобастагиҳо ба амал оварда мешавад\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "қуттӣ парофта мешавад %s"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "ба ҷои аз нав намудани қуттӣ коргузорӣ амалӣ хоҳад шуд %s"
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "кушодани rpmdb номумкин"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "муҳити \"%s\" аллакай вуҷуд дорад"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr "сарчашмаи маҷозӣ бояд маҳаллӣ бошад"
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "миёнаи иловашуда %s"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "дохилшавӣ ба миёнаи коргузориши аввала номумкин"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "нусхабардории файли hdlists..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "...нусхабардорӣ нагузашт"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "...нусхабардорӣ шуд"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
@@ -437,43 +376,49 @@ msgstr ""
 "дохилшавӣ ба миёнаи коргузориши аввала номумкин (файли Mandrake/base/hdlists "
 "ёфт нашуд)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "барқароркунии файли hdlists..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "...барқароркунӣ шуд"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...барқароркунӣ нагузашт: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "invalid hdlist description \"%s\" in hdlists file"
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "кӯшиши интихоби муҳити вуҷуд надоштаи \"%s\""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "интихобкунии миёнаи бисёр: %s"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "хориҷкунии миёнаи \"%s\""
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -484,7 +429,7 @@ msgstr ""
 "ин ҳангоми ба таври дастӣ насб намудани феҳрист дар ҳолати сохтанисарчашма "
 "ба амал меояд."
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -493,224 +438,224 @@ msgstr ""
 "сарчашмаи маҷозии\"%s\" бояд hdlist-и аввали дурустро дошт бошад ё ин "
 "киsynthesis, сарчашма эътибор надорад"
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "нусхабардории файли тавсифоти \"%s\"..."
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "ҳисоби md5sum-и сарчашмаи вуҷуд доштаи hdlist (ё ин ки synthesis)"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "санҷидани файли MD5SUM"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "нусхабардории сарчашмаи hdlist (ё synthesis)-и \"%s\"..."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "нусхабардории [%s] бо нокомӣ анҷомид (файл шубҳаомез кӯтоҳ аст)"
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr ""
 "hdlist (ё ин ки synthesis) аввали нусха гирифташуда ҳисоб мешавад md5sum"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "нусхабардории [%s] бо нокомӣ анҷомид (ба md5sum мутобиқат намекунад)"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "муаммои хондани файли synthesis-и муҳити \"%s\""
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "хониши файлҳои rpm аз [%s]"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "хондани файли rpm номумкин аз [%s]: %s"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "файлҳои rpm аз [%s] ёфт нашуданд"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "барқароркунии сарчашмаи hdlist (ё synthesis) \"%s\"..."
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "hdlist (ё synthesis)-и таҳқиқшуда ёфт шуд ҳамчун %s"
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr ""
 "аз hdlist-и аввалаи гирифташуда md5sum ҳисоб карда мешавад(ё ин ки synthesis)"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr "мувофиқ набудан ба md5sum"
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "hdlist (ё synthesis)-и аввала ба даст оварда нашуд"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "файли hdlist барои муҳити \"%s\" ёфт нашуд"
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "файли [%s] дар сарчашмаи монанд аллакай истифода мешавад \"%s\""
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "таҷзияи файли hdlist - и \"%s\" номумкин"
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "навиштани файли рӯйхатии \"%s\" номумкин"
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "навиштани файли рӯйхат барои миёнаи \"%s\""
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "дар файли рӯйхат барои \"%s\" чизе навишта нашудааст"
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "барои \"%s\"файли калиди кушод тафтиш карда мешавад..."
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...калиди гирифта шуда %s  аз файли калиди кушода \"%s\""
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "навиштани файли рӯйхатии \"%s\" номумкин"
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "хониши сарлавҳаҳо аз миёнаи \"%s\""
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "офариниши hdlist [%s]"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "файли сунъии офаридаи hdlist барои муҳити \"%s\""
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "%d сарлавҳаҳо дар кэш ёфт шуданд"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "хориҷи сарлавҳаҳои кӯҳнашудаи %d дар кэш"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "васлкунии %s"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "ҷудокунии %s"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "элементҳои %s-и ҷойивазшуда дар depslist"
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "ягон элемент ба depslist ҷойиваз нашуд"
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "номи файли rpm-и нодурусти [%s]"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "барқароркунии файли rpm [%s] ..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "дохилшавии файли rpm-и [%s] номумкин"
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "бақайдгирии файли rpm номумкин"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "хатогии ба қайдгирии қуттиҳои маҳаллӣ"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "қуттии бо номи %s нест"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Қуттиҳои зерин соҳиби %s: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "қуттиҳои зиёде бо чунин номи файли rpm \"%s\" вуҷуд доранд"
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "таҷзияи дурсти [%s] дар қиммати \"%s\" номумкин"
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -719,144 +664,159 @@ msgstr ""
 "сарчашмаи \"%s\" рӯйхати файли нодурустро истифода мебарад:\n"
 "  мумкин оина кӯҳна шудааст, барои истифодаи усули дигар кӯшиш намоед"
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "сарчашмаи \"%s\" ҷойгиршавии файлҳои rpm-ро муаяйн намекунад"
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "қуттии %s ёфт нашуд."
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi манбаи маълумот дастнорас аст"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "муҳити \"%s\" интихоб нашудааст"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "хондани файли rpm [%s] аз муҳити \"%s\" номумкин"
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 "муҳити бемуносибати \"%s\" ҳамчун ивазшаванда ишора шудааст, локиннодуруст"
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "дохилшавии муҳити \"%s\" номумкин"
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "даровардани бад: [%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "барқароркунии файли rpm аз миёна \"%s\"..."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "Тайёрӣ..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "раванди %d -ро барои иҷроиши амалиёт истифода баред"
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr "тарокуниш барои коргузорӣ дар %s (remove=%d, install=%d, upgrade=%d)"
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr "офаридани муҳит номумкин аст"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "хориҷкунии қуттии %s"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "хориҷи қуттии %s номумкин"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "иловаи барномаи коромода %s (id=%d, eid=%d, update=%d, file=%s)"
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "кор гузоштани қуттии %s номумкин"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "аз сабаби мавҷуд набудан %s"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "аз сабаби қонеъ набудан %s"
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr "кӯшиши фаъол намудан %s"
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr "барои нигоҳдории %s"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "барои коргузоштани %s"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "аз ҳисоби ба вуҷуд омадани муаммо бо %s"
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr "хоҳиш нашуда"
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Имзои нодуруст (%s)"
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "Калиди нодуруст ID (%s)"
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Имзо мавҷуд нест (%s)"
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "дар сатри фармонӣ proxy нодуруст нишон дода шудааст\n"
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: хондани файли rpm \"%s\" намешавад\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Мебахшед, интихоби бад боз кӯшиш кунед\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -873,27 +833,27 @@ msgstr ""
 "\n"
 "истифода:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - чопи ин пайғоми ёрӣ.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 " --auto         - ба таври автоматӣ барномаҳои коромодаро аз "
 "барномаҳоипешниҳодшуда интихоб намоед.\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 " --test         - тафтиш намоед, ки оё коргузории дуруст ба амал меояд.\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
@@ -901,18 +861,18 @@ msgstr ""
 " --force        - ба таври маҷбурӣ истифода баред, ҳатто агар якчанд "
 "барномаҳои                   коромода вуҷуд надошта бошад.\n"
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 "  --parallel     - urpmi, ки аз рӯи ангалҳои мошинаҳо тақсим шудааст.\n"
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - дигар решаро барои коргузории rpm истифода баред.\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -922,74 +882,64 @@ msgstr ""
 "                   барои коргузорӣ (на)кардани chroot бо хосият --root "
 "фоиданок аст.\n"
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - намуди муфассал.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - интихоби ҳамаи қуттиҳои бо ифода мувофиқ буда.\n"
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: хосияти номаълум \"-%s\", тафтиши истифода бо --help\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr "қуттиҳои номаълум"
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "қуттии номаълум"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr ""
 "хориҷ намудани барномаи коромода %s боиси қатъи кори системи шумомегардад"
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr "Ҳеҷ чизро хориҷ карда намешавад"
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "Тафтишкунӣ барои хориҷи қуттиҳои зерин"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
 "Барои қаноатмандии тобеиятҳо, қуттиҳои зерин хориҷ карда мешаванд (%d МБ)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (ҳ/Н) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "хориҷи қуттии %s "
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr "Хориҷкунӣ нагузашт"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Мебахшед, интихоби бад боз кӯшиш кунед\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1006,24 +956,24 @@ msgstr ""
 "\n"
 "истифода:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - танҳо муҳити навкунӣ истифода баред.\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 "  --media        - истифодаи танҳо муҳити додашуда, бо вергул ҷудошуда.\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 " --excludemedia - сарчашмаҳое ки бо вергул ҷудо шудаанд, истифода набаред.\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1031,17 +981,17 @@ msgstr ""
 "  --sortmedia    - аз рӯи сатрҳое ки бо вергул ҷудо шудааст сарчашмаҳоро "
 "банавъҳо ҷудо намоед.\n"
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr "  --synthesis    - synthesis-ро ба ҷои urpmi db истифода баред.\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - ҳолати муфассал.\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1052,90 +1002,90 @@ msgstr ""
 "набошад\n"
 "                   сатр, номувофиқ аст бо усули интерактивӣ).\n"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --uniq         - хати рости монандро чоп накунед.\n"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all          - чопи ҳама тэгҳо.\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group        - чопи гурӯҳи тэг: гурӯҳ.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --ҳаҷм          - чопи ҳаҷми тэг: ҳаҷм.\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --epoch        - чопи epoch тэг: epoch.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary      - чопи ҷамъбасти тэг: ҷамъбаст.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description  - чопи тасвироти тэг: тасвирот.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr "  --sourcerpm    - тэг sourcerpm-ро чоп намоед: rpm-и аввала.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr "  --packager     - тэг packager-ро чоп намоед: қуттӣ тартибдиҳанда.\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr "  --buildhost    - tag buildhost: build host -ро чоп намоед.\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --url          - чоп намоед тэг url: url.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr ""
 "  --provides     - тэг provides-ро чоп намоед: ҳамаи файлҳои "
 "пешниҳодшаванда.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr " --requires     -  тэг requires-ро чоп намоед: ҳамаи вобастагиҳоро.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files        - чопи tag files: ҳамаи файлҳо.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr " --conflicts    - тэг conflicts-ро чоп намоед: ҳамаи мухолифатро.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr ""
 "  --obsoletes    - тэг obsoletes-ро чоп намоед: ҳамаи файлҳои кӯҳнашуда.\n"
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
@@ -1144,23 +1094,23 @@ msgstr ""
 "  --env          - муҳити махсусро истифода баред (одатан ҳисоботи\n"
 "                   хатогиҳо).\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr "  -i             - инкоркунии фарқиятҳои вазъият дар ҳар восита.\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - тафсир, релиз ва архитектураро бо номҳояшон чоп намоед.\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - дарбаргирии рамзи perl бевосита ҳамчун perl -e.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
@@ -1168,7 +1118,7 @@ msgstr ""
 "  -a             - амалгари дучанда AND, ба true бар мегардад, агар ҳардуи\n"
 "                   ифодаҳо дуруст бошанд.\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
@@ -1176,22 +1126,22 @@ msgstr ""
 "  -o             - амалгари дуӣ OR, true-ро бармегардонад, агар "
 "яке                    аз ифодаҳо true бошад.\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - ягонӣ НЕ, рост агар ифода дурӯғ бошад.\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr "  (              - қавси чап барои кушодани ифодаи гурӯҳ.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr "  )              - қавси рост барои пӯшидани ифодаи гурӯҳ.\n"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
@@ -1200,12 +1150,12 @@ msgstr ""
 "даъвати баръакс :\n"
 "%s\n"
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "барои %s давраи махсус истифода мегардад\n"
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1222,14 +1172,14 @@ msgstr ""
 "\n"
 "истифода:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - synthesis -и додашударо ба ивази urpmi db истифода "
 "намоед.\n"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
@@ -1237,7 +1187,7 @@ msgstr ""
 "  --auto-select  - барои аз нав намудани систем барномаҳои "
 "коромодаробеихтиёрона интихоб намуд.\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
@@ -1246,7 +1196,7 @@ msgstr ""
 "  --no-uninstall - барои хориҷи барномаи коромода ҳеҷ чизро пешниҳоднакунед, "
 "коргузориро қатъ накунед.\n"
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1256,7 +1206,7 @@ msgstr ""
 "доред, хориҷ намоед\n"
 "                   барномаҳои коромодаҳое ки ба хориҷшавӣ меоранд.\n"
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1268,24 +1218,24 @@ msgstr ""
 "гардад                   \n"
 "                   нобаён %d мебошад.\n"
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - дарозии тарокуниши хурд, пешфарз %d мебошад.\n"
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
 "  --fuzzy        - дар асоси мантиқи нодуруст ба кофтукобӣ оғоз намоед(ба "
 "монандӣ -y).\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - қуттии оянда қуттии аввала аст (ба монандӣ -s).\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
@@ -1293,18 +1243,18 @@ msgstr ""
 "коргузорӣнамоед\n"
 "                   (бе ҳисоби дуӣ).\n"
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - rpm-ро пеш аз ҳама аз пинҳонӣ хориҷ кунед.\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr ""
 "  --noclean      - rpm-и истифода бурда нашударо дар пинҳонӣ нигоҳ доред.\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1314,7 +1264,7 @@ msgstr ""
 "                   барномаҳои коромодаро бе тафтиши вобастагиҳо муаяйн "
 "намояд.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1324,7 +1274,7 @@ msgstr ""
 "                   вобастагиҳо ва бутунӣ барои пурсиши корван иҷозат дода "
 "шавад.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1334,26 +1284,26 @@ msgstr ""
 "                   барои коргузоркунии chroot бо хосият --root фоиданок "
 "аст.\n"
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 "  --wget          - барои гирифтани файлҳои хориҷшуда wget-ро истифода "
 "баред.\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 "  --curl         - curl-ро барои гирифтани файлҳои хориҷшуда истифода "
 "намоед.\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - суръати қабулро маҳдуд намоед.\n"
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1363,7 +1313,7 @@ msgstr ""
 "                   (--no-resume онро хомӯш мекунад, бо нобаёнӣ хомӯш карда "
 "мешавад).\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1373,7 +1323,7 @@ msgstr ""
 "                    даргоҳи 1080 истифода мешавад (шакли <proxyhost[:port]"
 ">).\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1383,7 +1333,7 @@ msgstr ""
 "диҳед\n"
 "                   (шакли <корванд:гузарвожа>).\n"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1392,12 +1342,12 @@ msgstr ""
 "  --bug          - ба феҳрист ҳисобот оиди хатогиҳо бароред\n"
 "                   бо далели зерин.\n"
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - интерфейси X истифода баред.\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1406,7 +1356,7 @@ msgstr ""
 "  --best-output  - мувофиқи давра интерфейси беҳтаринро бояд интихоб кард:\n"
 "                   Х ё ин ки намуди матнӣ.\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1416,79 +1366,68 @@ msgstr ""
 "                   (--no-verify-rpm онро хомӯш намоед, дохил шудааст аз "
 "рӯипешфарз).\n"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - роҳҳое ки бо вергул ишора шудаанд, хориҷ намоед.\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - файлҳои ҳуҷҷатҳоро хориҷ намоед.\n"
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 "  -a             - ҳамаи мувофиқатҳоро аз сатри фармонӣ интихоб намоед.\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 "  -p             - ба ҷустуҷӯӣ дар provides иҷозат диҳед барои дастрас "
 "намуданибарномаҳои коромода.\n"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 "  -P             - барои барномаи коромода provides-ро истифода набаред.\n"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - ҷустуҷӯи норӯшан ниҳодан (ҳамчун --fuzzy).\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 "  -s             - қуттии оянда қуттии сарчашмавӣ аст (ҳамчун --src).\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - усули ором.\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 "  номҳо ё файлҳое ки дар сатри фармони ишора шуда коргузорӣ хоҳанд шуд.\n"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr "Барои захиракунии файл ҷойгиршавиро интихоб кунед"
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "дар сатри фармонӣ proxy нодуруст нишон дода шудааст\n"
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: хосияти номаълум \"-%s\", тафтиши истифода бо --help\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr "Ҳангоми истифодаи --install-src чӣ бояд кард бо файлҳои дуии rpm"
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1510,22 +1449,22 @@ msgstr ""
 "\n"
 "Шумо чи кор кардан мехоҳед?"
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "Ҳеҷ кор накунед"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr "Бале, дар ҳақиқат онро коргузорӣ кунед"
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr "Захиракунии файл"
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1541,12 +1480,12 @@ msgstr ""
 "\n"
 "Шумо онро танҳо захира карда метавонед. Интихоби шумо чӣ гуна аст?"
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, c-format
 msgid "Install it"
 msgstr "Онро коргузорӣ кунед"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1555,42 +1494,42 @@ msgstr ""
 "Феҳристи [%s] аллакай мавҷуд аст, марҳамат карда дигар феҳристро барои "
 "маърӯзаи оиди хато, истифода баред ё онро нобуд созед"
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Офридани феҳристи [%s] барои маърӯзаи ғалат номумкин"
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Танҳо фавқулкорванд барои коргузоштани қуттиҳо рухсат дорад"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "Яке аз қуттиҳои зерин барои коргузории %s лозим аст:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Яке аз қуттиҳои зерин даркор аст:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Интихоби шумо чист? (1-%d) "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "барномаи коромода насб мегардад..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "Коргузорӣ намудан..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1599,12 +1538,12 @@ msgstr ""
 "Якчанд барномаҳои коромода коргузорӣ нахоҳанд шуд:\n"
 "%s"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr "шумо розӣ ҳастед ?"
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1615,7 +1554,7 @@ msgstr ""
 "кард, онгоҳ коргузориро давом додан мумкин нест\n"
 "%s\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1625,15 +1564,15 @@ msgstr ""
 "%s\n"
 "Шумо розӣ ҳастед?"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
 "Барои қаноатмандии тобеиятҳо қуттиҳои зерин кор гузошта мешаванд (%d МБ)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1642,37 +1581,47 @@ msgstr ""
 "Шумо бояд ҳуқуқи root-ро дошта бошед барои насб намудани вобастагиҳоизерин:\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "қуттиҳои сарчашмавӣ гирифтан номумкин, кандашавӣ"
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Лутфан муҳити бо номи \"%s\" ба дастгоҳи [%s] дароред"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Вақте, ки тайёр Enter-ро пахш кунед..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Фаровири қуттии `%s'..."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% аз они %s тамом шуд, ETA = %s, суръат = %s"
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% ба охир расид, суръат = %s"
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Қуттиҳои зерин имзоҳои бад доранд"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Шумо хоҳиши давом додани коргузориро доред ?"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1683,57 +1632,57 @@ msgstr ""
 "%s\n"
 "Мумкин шумо додаҳои urpmi-ро нав мекунед"
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "Коргузорӣ нагузашт"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr "тақсимкунии %s"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr "коргузории %s"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Барномаи коромодаи `%s' (%s/%s) коргузорӣ мешавад..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Коргузориро бе тафтиши тобеиятҳо кӯшиш кунем? (Ҳ/Н) "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Коргузориро боз устувортар (--force) кӯшиш кунем? (Ҳ/Н)  "
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d коргузорӣ амалӣ нагардид"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "Коргузорӣ мумкин аст"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "Ҳамааш аллакай кор гузошта шудааст"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr "urpmi бозоғоз шуда истодааст"
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1758,24 +1707,24 @@ msgstr ""
 "\n"
 "ва [хосиятҳо] аз\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - create an update medium.\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
 "  --probe-synthesis - кӯшиши ёфтан ва истифодаи файли synthesis-ро намоед.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr ""
 "  --probe-hdlist - барои кофтан ва истифодаи файли hdlist кӯшиш намоед.\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
@@ -1783,7 +1732,7 @@ msgid ""
 msgstr ""
 " --no-probe     - барои дарёфти  synthesis ё файли hdlist кӯшиш накунед.\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -1792,7 +1741,7 @@ msgstr ""
 "  --disrtib      - аз сарчашмаи коргузорӣ ба таври автоматикӣ дигар\n"
 "манбаъҳоро                    созед.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1804,7 +1753,7 @@ msgstr ""
 "                    XXX метавонад main, contrib, updates бошад ё ин ки\n"
 "                   ҳама чизе ки аллакай амалӣ шудааст ;-)\n"
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1813,7 +1762,7 @@ msgstr ""
 "  --from         - барои оинаҳои рӯйхати url-и додашуда истифода баред\n"
 "                   аз рӯи пешфарз истифода мешавад%s\n"
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1826,7 +1775,7 @@ msgstr ""
 "release\n"
 "                   муқаррар шудааст, истифода мегардад.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
@@ -1836,7 +1785,7 @@ msgstr ""
 "                   санъати барномаи коромодаи муқарраршуда истифода мешавад\n"
 "                   mandrake-release.\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
@@ -1845,73 +1794,52 @@ msgstr ""
 "  --virtual      - сарчашмаи маҷозие ки ҳамеша up-to-date аст тартиб диҳед,\n"
 "                   танҳо файли суратҷаласа иҷозат дода шудааст://.\n"
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - тафтиши файли MD5SUM-ро хомӯш кунед.\n"
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - феҳристи кэши сарлавҳаҳоро тоза намоед.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - ба таври маҷбурӣ файлҳои hdlist-ро созед.\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"интихоби номуаяйн '%s'\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "ба cooker-и тақсимотӣ навоварӣ дароварда намешавад\n"
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "барқароркунии оинаҳо дар %s ..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"ҳоҷат нест барои додани <роҳи нисбии hdlist> бо --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "ҳоҷат нест барои додани <роҳи нисбии hdlist> бо --distrib"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "нав кардани муҳити \"%s\" номумкин\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"<роҳи нисбии hdlist> ҳозир нест\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<роҳи нисбии hdlist> ҳозир нест\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"`with' барои сарчашмаи шабакагӣ вуҷуд надорад\n"
+msgid "`with' missing for network media\n"
+msgstr "`with' барои сарчашмаи шабакагӣ вуҷуд надорад\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "офаридани муҳити \"%s\" номумкин\n"
@@ -1930,6 +1858,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - интихоби ҳама муҳит.\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"интихоби номуаяйн '%s'\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1945,7 +1882,7 @@ msgstr ""
 "элемент барои хориҷ кардан ҳозир нест\n"
 "(яке аз %s)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1954,28 +1891,28 @@ msgstr ""
 "истифода: urpmi.removemedia [-a] <ном> ...\n"
 "дар куҷо <ном> ин номи муҳит барои нав кардан.\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - навкунии танҳо муҳити навкунӣ.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr "  --force-key    - зӯран навкунии gpg-калид.\n"
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - ҳамаи сарчашмаҳои ҷудонашавандаро интихоб намоед.\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "ба навкунӣ чизе нест (барои иловаи муҳит urpmi.addmedia-ро истифода баред)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1984,7 +1921,7 @@ msgstr ""
 "элемент барои нав кардан ҳозир нест\n"
 "(яке аз %s)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -2001,40 +1938,40 @@ msgstr ""
 "\n"
 "истифода:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - рӯйхаткунии қуттиҳои дастрас.\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - рӯйхаткунии муҳити дастрас.\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - рӯйхати муҳитҳои дастрас ва url-и онҳо.\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 "  --dump-config  - рӯгирифти config дар намуди нишонванди urpmi.addmedia.\n"
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 "  --list-nodes   - рӯйхаткунии гиреҳҳои дастрас бо истифодаи --parallel.\n"
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - рӯйхаткунии тахаллусҳои пареллели дастрас.\n"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
@@ -2044,7 +1981,7 @@ msgstr ""
 "ифодашудааст гиред\n"
 "                   дар stdout (танҳо барои root).\n"
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
@@ -2053,7 +1990,7 @@ msgstr ""
 "коромодарогиред\n"
 "                   (танҳо барои root).\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
@@ -2062,17 +1999,17 @@ msgstr ""
 "  --use-distrib  - танзими urpmi дар ҳаркат аз дарахти distrib.\n"
 "                   Ин интихоб пурсиши тақсимотро иҷозат медиҳад.\n"
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - чопкунии changelog.\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - дархости васеъ ба тобеиятҳои қуттӣ.\n"
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -2080,59 +2017,112 @@ msgid ""
 msgstr ""
 "  -u             - хориҷи қуттӣ агар нашри навтарин коргузошта бошад.\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - ҳосилкунии пурра бо қуттӣ барои хориҷ шудан.\n"
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - ҷустуҷӯи баръакс барои қуттии талабшуда.\n"
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 "  -i             - ахбороти фоиданокро дар намуди барои хондан қуллай чоп "
 "кардан.\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - чопи гурӯҳҳо ҳамчун бо ном.\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - чопи нашр ва нусха ҳамчун бо ном.\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - барориш рӯйхати файлҳои баста.\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 "  номҳо ва ё файлҳои rpm дар сатри фармонӣ ишора шуда дархост мегарданд.\n"
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: хосияти номаълум \"-%s\", тафтиши истифода бо --help\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: хондани файли rpm \"%s\" намешавад\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes танҳо истифода бурда мешавад бо --parallel"
 
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "webfetch-и номаълум `%s' !!!\n"
+
+#~ msgid "copy failed: %s"
+#~ msgstr "нусхабардорӣ нагузашт: %s"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "wget вуҷуд надорад\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "wget аз кор баромад бо %d ё бо ишораи %d\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "curl вуҷуд надорад\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "curl нуқсон дорад: тамом шуд бо %d ё бо ишорати %d\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "rsync мавҷуд нест\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "rsync аз фаъолият баромад: тамом шуд бо %d ё бо ишораи %d\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "ssh мавҷуд нест\n"
+
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpme: хосияти номаълум \"-%s\", тафтиши истифода бо --help\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmi: хосияти номаълум \"-%s\", тафтиши истифода бо --help\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr ""
+#~ "Барои қаноатмандии тобеиятҳо қуттиҳои зерин кор гузошта мешаванд (%d МБ)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "ҳоҷат нест барои додани <роҳи нисбии hdlist> бо --distrib"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "<роҳи нисбии hdlist> ҳозир нест\n"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "`with' барои сарчашмаи шабакагӣ вуҷуд надорад\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmq: хосияти номаълум \"-%s\", тафтиши истифода бо --help\n"
+
 #~ msgid "no webfetch (curl or wget currently) found\n"
 #~ msgstr "webfetch ёфт нашуд(дар ҳолати curl ё wget)\n"
 
diff --git a/po/th.po b/po/th.po
index 0e73f511..f99b6b53 100644
--- a/po/th.po
+++ b/po/th.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2002-11-25 13:52-0500\n"
 "Last-Translator: Wachara Chinsettawong <wachara@yahoo.com>\n"
 "Language-Team: Thai <th@li.org>\n"
@@ -50,22 +50,22 @@ msgstr ""
 "การติดตั้ง Package แบบอัตโนมัต...\n"
 "คุณได้เลือกที่จะติดตั้ง Package %s\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "ตกลงไหมครับ"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "ตกลง"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "ยกเลิก"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) "
@@ -75,382 +75,327 @@ msgstr " (Y/n) "
 msgid "%s: command not found\n"
 msgstr "%s: ไม่พบคำสั่งนี้\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "where [options] are from\n"
 msgstr ""
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - พิมพ์ข้อความช่วย\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, fuzzy, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr " --group        - พิมพ์ tag group: group."
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, fuzzy, c-format
 msgid "                    defaults is %s.\n"
 msgstr "  --list         - แสดงรายชื่อแพ็คเกจที่มีอยู่\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "webfetch %s ไม่รู้จัก !!!\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "ไม่รู้จักโปรโตคอลที่ระบุไว้%s"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "ไม่สามารถใช้งานโปรโตคอล: %s"
 
-#: ../urpm.pm:189
-#, fuzzy, c-format
-msgid "copy failed: %s"
-msgstr "...การคัดลอกล้มเหลว"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "wget หายไป\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget ล้มเหลว: ออกจากระบบด้วย %d หรือด้วยสัญญาณ %d\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "curl หายไป\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl ล้มเหลวออกด้วย %d หรือด้วยสัญญาณ %d\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "rsync หายไป\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "rsync ล้มเหลวออกจากระบบด้วย %d หรือด้วยสัญญาณ %d\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "ssh ไม่มีอยู่\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr ""
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr ""
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "การอ่านข้อมูลล้มเหลว: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "มีข้อผิดพลาดใน config file บรรทัดที่ %s"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr "อุปกรณ์\"%s\"พยามยามใช้ hdlistที่ใช้อยู่แล้ว ,อุปกรณ์ถูกยกเลิกไม่ใช้"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr "อุปกรณ์\"%s\"พยายามเลือกใช้อุปกรณ์ที่ใช้แล้ว, อุปกรณ์ถูกยกเลิกไม่ใช้"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
 "medium"
 msgstr "ไม่สามารถดูแลอุปกรณ์\"%s\"เพราะว่า list file ได้ถูกใช้โดยอุปกรณ์อื่นแล้ว"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr "ไม่สามารถใช้ชื่อ \"%s\" สำหรับอุปกรณ์ที่ไม่มีชื่อเพราะว่ามันได้ถูกใช้แล้ว"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr "ไม่สามารถนำอุปกรณ์ \"%s\" มาใช้เพราะว่าไม่มี list file[%s]"
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "ไม่สามารถกำหนดอุปกรณ์ด้วย hdlist file นี้ [%s]"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "ไม่สามารถใช้งาน hdlist file \"%s\", medium ignored"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "ไม่สามารถใช้งาน list file ของ \"%s\", medium ignored"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "กำลังเลี่ยงการทำงานของอุปกรณ์ \"%s\""
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, fuzzy, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
 "ignored"
 msgstr "อุปกรณ์\"%s\"พยามยามใช้ hdlistที่ใช้อยู่แล้ว ,medium ignore"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, fuzzy, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "อุปกรณ์\"%s\"พยายามเลือกใช้อุปกรณ์ที่ใช้แล้ว, medium ignored"
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "ไม่สามารถหา hdlist file สำหรับ\"%s\",medium ignored"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "ไม่สามารถหา list file สำหรับ\"%s\",medium ignored"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "list file ไม่ปะติดปะต่อ \"%s\", medium ignored"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "ไม่สามารถตรวจสอบ list file สำหรับ \"%s\", medium ignored"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "จำนวนเม้าท์พ้อยท์มากเกินไปสำหรับอุปกรณ์แบบเคลื่อนย้ายได้\"%s\""
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "กำลังนำอุปกรณ์ที่เคลื่อนย้ายได้จาก \"%s\" ออกมา"
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "ใช้อุปกรณ์แบบย้ายเข้าออกได้ที่แตกต่าง [%s] สำหรับ \"%s\""
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "ไม่สามาถจะดึงส่วนของ pathname สำหรับอุปกรณ์แบบเคลื่อนย้ายได้\"%s\""
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "ไม่สามารถเขียน config file [%s]"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "เขียน config file[%s]"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "ไม่สามารถใช้งาน \"%s\" ใน file [%s]"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "กำลังตรวจสอบ parallel handler ในไฟล์ [%s]"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "พบ parallel handler สำหรับ %s"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, fuzzy, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "กำลังใช้อุปกรณ์ที่เกี่ยวข้องสำหรับ parallel mode : %s "
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "ไม่สามารถใช้ parallel option \"%s\""
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, fuzzy, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
 "update or --parallel"
 msgstr "--synthesis cannot be used with --media, --update or --parallel"
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "กำลังตรวจสอบไฟล์ synthesis [%s]"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "กำลังตรวจสอบไฟล์ hdlist [%s]"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, fuzzy, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "อุปกรณ์\"%s\"พยายามเลือกใช้อุปกรณ์ที่ใช้แล้ว, medium ignored"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, fuzzy, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "มีปัญหาในการอ่านไฟล์ synthesis สำหรับอุปกรณ์\"%s\""
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "ทำการผ่านครั้งที่สองเพื่อทดสอบ ความเป็นอิสระ\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, fuzzy, c-format
 msgid "skipping package %s"
 msgstr "ไม่มี package ที่ชื่อ %s"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, fuzzy, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "ไม่สามารถที่จะลบแพ็คเกจ %s"
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, fuzzy, c-format
 msgid "unable to open rpmdb"
 msgstr "ไม่สามารถลงทะเบียน rpm file"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "อุปกรณ์\"%s\"มีอยู่แล้ว"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr ""
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "อุปกรณ์ที่ถูกเพิ่มเข้ามา %s"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "ไม่สามารถเข้าถึงอุปกรณ์เพื่อใช้ในการติดตั้งอันแรก"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "กำลังคัดลอกไฟล์ hdlist"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, fuzzy, c-format
 msgid "...copying failed"
 msgstr "การคัดลอกสมบูรณ์"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "การคัดลอกสมบูรณ์"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
 "found)"
 msgstr "ไม่สามารถที่จะเข้าถึงอุปกรณ์เพื่อการติดตั้งตัวแรก (ไม่พบไฟล์ Mandrake/base/hdlists)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "กำลังอ่านข้อมูลจากไฟล์ hdlists"
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "การอ่านข้อมูลเรียบร้อย"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "การอ่านข้อมูลล้มเหลว: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "คำอธิบาย hdlist ไม่ถูกต้อง \"%s\" ในไฟล์ hdlists"
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, fuzzy, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "พยายามที่จะเลือกใช้อุปกรณ์ที่ไม่มี\"%s\""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "พยายามที่จะเลือกใช้มีเดียหลายๆตัว: %s"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "กำลังทำการย้ายออกอุปกรณ์\"%s\""
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -458,372 +403,387 @@ msgid ""
 "medium."
 msgstr ""
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, fuzzy, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
 "ignored"
 msgstr "อุปกรณ์\"%s\"พยามยามใช้ hdlistที่ใช้อยู่แล้ว ,medium ignore"
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "กำลังคัดลอกคำอธิบายไฟล์ของ \"%s\"..."
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, fuzzy, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "กำลังคัดลอกโค้ด hdlist (หรือ synthesis) ของ \"%s\"..."
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "กำลังตรวจสอบไฟล์ MD5SUM"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "กำลังคัดลอกโค้ด hdlist (หรือ synthesis) ของ \"%s\"..."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, fuzzy, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "กำลังคัดลอกโค้ด hdlist (หรือ synthesis) ของ \"%s\"..."
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, fuzzy, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "การทำสำเนา [%s] ไม่สำเร็จ"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "มีปัญหาในการอ่านไฟล์ synthesis สำหรับอุปกรณ์\"%s\""
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "กำลังอ่านไฟล์ rpm จาก [%s]"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "ไม่สามารถอ่านไฟล์ rpm จาก [%s]: %s"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "ไม่พบ rpm files จาก [%s]"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "กำลังดึงโค้ด hdlist (หรือ synthesis) ของ \"%s\"..."
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, fuzzy, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "กำลังคัดลอกโค้ด hdlist (หรือ synthesis) ของ \"%s\"..."
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "การดึงโค้ดจาก hdlist (หรือ synthesis)ล้มเหลว"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr ""
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "การดึงโค้ดจาก hdlist (หรือ synthesis)ล้มเหลว"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "ไม่พบ hdlist file สำหรับอุปกรณ์\"%s\""
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "ไฟล์ [%s] มีใช้งานอยู่ในที่เดียวกันอยู่แล้ว\"%s\""
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "ไม่สามารถ parse hdlist file of \"%s\""
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "ไม่สามารถเขียน list file ของ\"%s\""
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "กำลังเขียน list file สำหรับอุปกรณ์\"%s\""
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "ไม่มีการเขียนใน list file สำหรับ\"%s\""
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, fuzzy, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "กำลังอ่านคำอธิบายไฟล์ของ \"%s\"..."
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, fuzzy, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "ไม่สามารถเขียน list file ของ\"%s\""
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, fuzzy, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "ไม่สามารถเขียน list file ของ\"%s\""
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "กำลังทำการอ่าน headers จากอุปกรณ์\"%s\""
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "สร้าง hdlist [%s]"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "สร้าง hdlist synthesis file สำหรับ อุปกรณ์ \"%s\""
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "พบ %d header ใน cache"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "กำลังลบ %d headerที่ล้าสมัยใน cache"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "กำลังติดตั้ง %s"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "กำลังถอดถอน %s"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "ย้าย %s ใน depslist"
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "ไม่มีค่าซึ่งถูกย้ายใน depslist"
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "ชื่อ rpm fileไม่ถูกต้อง [%s]"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, fuzzy, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "กำลังอ่านข้อมูลไฟล์ rpm..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "ไม่สามารถใช้งาน rpm file [%s]"
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, fuzzy, c-format
 msgid "unable to register rpm file"
 msgstr "ไม่สามารถใช้งาน rpm file [%s]"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "ลงทะเบียน local package มีข้อผิดพลาด"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "ไม่มี package ที่ชื่อ %s"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "packages ต่อไปนี้มี %s: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "มีหลาย package ที่มีชื่อไฟล์เหมือนกับ \"%s\""
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "ไม่สามารถที่จะผ่าน [%s] ด้วยค่า \"%s\"อย่างถูกต้อง"
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
 "  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr ""
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "หา %s package ไม่พบ"
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "ฐานข้อมูล urpmi ถูกล็อก"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "อุปกรณ์ \"%s\" ไม่ได้ถูกเลือก"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "ไม่สามารถอ่าน rpm file [%s] จาก \"%s\""
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "อุปกรณ์ที่ไม่เชื่อมกัน \"%s\" ถูกระบุว่าถอดเปลี่ยนได้แต่มันไม่ใช่"
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "ไม่สามารถใช้อุปกรณ์\"%s\""
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr " inputไม่ถูกต้อง :[%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, fuzzy, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "กำลังอ่านข้อมูลไฟล์ rpm..."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "กำลังเตรียม..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr ""
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, fuzzy, c-format
 msgid "unable to create transaction"
 msgstr "ไม่สามารถสร้างอุปกรณ์ \"%s\"\n"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, fuzzy, c-format
 msgid "removing package %s"
 msgstr "ไม่สามารถที่จะลบแพ็คเกจ %s"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "ไม่สามารถที่จะลบแพ็คเกจ %s"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr ""
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "ไม่สามารถติดตั้งแพ็คเกจ %s"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, fuzzy, c-format
 msgid "due to missing %s"
 msgstr "wget หายไป\n"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, fuzzy, c-format
 msgid "trying to promote %s"
 msgstr "ไม่มีอะไรที่ต้องลบทิ้ง\n"
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, fuzzy, c-format
 msgid "in order to keep %s"
 msgstr "ไม่สามารถติดตั้งแพ็คเกจ %s"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, fuzzy, c-format
 msgid "in order to install %s"
 msgstr "ไม่สามารถติดตั้งแพ็คเกจ %s"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, fuzzy, c-format
 msgid "due to conflicts with %s"
 msgstr "%s ขัดแย้งกับ %s"
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr ""
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr ""
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr ""
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr ""
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "การแจ้งพร็อกซี่ที่ไม่ดี\n"
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq:ไม่สามารถอ่าน rpm file \"%s\"\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "การเลือกไม่ถูกต้อง ลองใหม่ครับ\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -840,112 +800,102 @@ msgstr ""
 "\n"
 "usage:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - พิมพ์ข้อความช่วย\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --อัตโนมัติ         - ทำการเลือกแพ็คเกจโดยอัตโนมัติ.\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr "  --test         - ตรวจสอบว่าการติดตั้งสามารถทำได้ถูกต้องหรือไม่.\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - บังคับ invocation ถึงแม้ว่าแพ็คเกจจะไม่มีอยู่\n"
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - distributed urpmi across machines of alias.\n"
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, fuzzy, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --curl         - ใช้ curl เพื่อดึงไฟล์ซึ่งอยู่ภายนอก\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - โหมดคำ\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - เลือกทั้งหมดที่ตรงกับคำสั่ง\n"
 
-#: ../urpme:68
-#, fuzzy, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: ตัวเลือกไม่รู้จัก \"-%s\" ตรวจสอบการใช้จาก --help\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, fuzzy, c-format
 msgid "unknown packages"
 msgstr "แพ็คเกจไม่รู้จัก"
 
-#: ../urpme:91
+#: ../urpme:83
 #, fuzzy, c-format
 msgid "unknown package"
 msgstr "แพ็คเกจไม่รู้จัก"
 
-#: ../urpme:101
+#: ../urpme:93
 #, fuzzy, c-format
 msgid "removing package %s will break your system"
 msgstr "แพ็คเกจ %s ที่กำลังลบอยู่จะทำให้ระบบเสียหายได้\n"
 
-#: ../urpme:103
+#: ../urpme:95
 #, fuzzy, c-format
 msgid "Nothing to remove"
 msgstr "ไม่มีอะไรที่ต้องลบทิ้ง\n"
 
-#: ../urpme:107
+#: ../urpme:99
 #, fuzzy, c-format
 msgid "Checking to remove the following packages"
 msgstr "หนึ่งใน Packages ต่อไปนี้ต้องได้รับการติดตั้ง "
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr "เพื่อความถูกต้องของการเป็นอิสระระหว่างโปรแกรมแพ็คเกจบางตัวจะถูกลบทิ้ง(%d MB)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (y/N) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, fuzzy, c-format
 msgid "removing %s"
 msgstr "ไม่สามารถที่จะลบแพ็คเกจ %s"
 
-#: ../urpme:123
+#: ../urpme:115
 #, fuzzy, c-format
 msgid "Removing failed"
 msgstr "...การคัดลอกล้มเหลว"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "การเลือกไม่ถูกต้อง ลองใหม่ครับ\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, fuzzy, c-format
 msgid ""
 "urpmf version %s\n"
@@ -962,38 +912,38 @@ msgstr ""
 "\n"
 "usage:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - ใช้เพื่ออัพเดตมีเดีย\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, fuzzy, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - เลือกใช้เฉพาะมีเดียที่ถูกขั้นด้วยเครื่องหมายลูกน้ำ\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, fuzzy, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --media        - เลือกใช้เฉพาะมีเดียที่ถูกขั้นด้วยเครื่องหมายลูกน้ำ\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, fuzzy, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr "  --media        - เลือกใช้เฉพาะมีเดียที่ถูกขั้นด้วยเครื่องหมายลูกน้ำ\n"
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, fuzzy, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  -v             - โหมดคำ\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, fuzzy, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1001,87 +951,87 @@ msgid ""
 "                   line, incompatible with interactive mode).\n"
 msgstr " --quiet        - ไม่ต้องพิมพ์ชื่อ Tag (default ถ้า tag ไม่ได้ถูกระบุใน command"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, fuzzy, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr " --size         - พิมพ์ขนาด tag:ขนาด"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, fuzzy, c-format
 msgid "  --all          - print all tags.\n"
 msgstr " --all          - พิมพ์ tag ทั้งหมด"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, fuzzy, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr " --group        - พิมพ์ tag group: group."
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, fuzzy, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr " --size         - พิมพ์ขนาด tag:ขนาด"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, fuzzy, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr " --size         - พิมพ์ขนาด tag:ขนาด"
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, fuzzy, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr " --summary      - พิมพ์ tag summary: summary"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, fuzzy, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr " --description  - พิมพ์ tag รายละเอียด  : รายละเอียด"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, fuzzy, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr " --group        - พิมพ์ tag group: group."
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, fuzzy, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr " --group        - พิมพ์ tag group: group."
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, fuzzy, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr " --files        - พิมพ์  tag files: file ทั้งหมด (หลายบรรทัด)."
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, fuzzy, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr " --serial       - พิมพ์ tag serial: serial"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, fuzzy, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr " --provides     -พิมพ์  tag provides: all provides (หลายบรรทัด). "
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, fuzzy, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr " --requires     - พิมพ์  tag ที่ต้องการ:ที่ต้องการทั้งหมด(หลายบรรทัด)."
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, fuzzy, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr " --files        - พิมพ์  tag files: file ทั้งหมด (หลายบรรทัด)."
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, fuzzy, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr " --conflicts    -พิมพ์ tag ที่เข้ากันไม่ได้:เข้ากันไม่ได้ทั้งหมด(หลายบรรทัด)."
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, fuzzy, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr " --obsoletes    -พิมพ์ tag ไม่ใช้แล้ว:ใช้ไม่ได้ทั้งหมด(หลายบรรทัด)."
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
@@ -1090,61 +1040,61 @@ msgstr ""
 "  --env          - ใช้เอ็นไวลอนเม็นท์แบบเฉพาะ(โดยทั่วไปใช้กับการรายงาน\n"
 "                   บัก).\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, fuzzy, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr "  -f             - บังคับการสร้างไฟล์ hdlist\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - เวอร์ชั่นที่พิมพ์, รีลีสและ arch พร้อมชื่อ.\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, fuzzy, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -c             - ทำความสะอาดส่วน headers ของไดเร็คตอรี่ cache \n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, fuzzy, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
 msgstr "  -u             - ลบแพ็คเกจถ้าแพ็คเกจที่ดีกว่ามีการติดตั้งอยู่แล้ว.\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, fuzzy, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  -u             - ลบแพ็คเกจถ้าแพ็คเกจที่ดีกว่ามีการติดตั้งอยู่แล้ว.\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, fuzzy, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr "  -a             - เลือกทั้งหมดที่ตรงกับคำสั่ง\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, fuzzy, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr "  -a             - เลือกทั้งหมดที่ตรงกับคำสั่ง\n"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
 "%s\n"
 msgstr ""
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1161,32 +1111,32 @@ msgstr ""
 "\n"
 "usage:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, fuzzy, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --เลือกอัตโนมัติ  - เลือกแพ็คเกจที่ต้องการอัพเกรดอัตโนมัติ\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr ""
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that leads to remove.\n"
 msgstr ""
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1194,37 +1144,37 @@ msgid ""
 "                   default is %d.\n"
 msgstr ""
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - ค้นหาแบบไม่เจาะจง(เช่นเดียวกับ -y).\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - แพ็คเกจต่อไปเป็นส่วนของโค้ด (เช่นเดียวกับ -s).\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - remove rpm from cache before anything else.\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - เก็บ rpm ซึ่งไม่ถูกใช้ใน cache.\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1233,7 +1183,7 @@ msgstr ""
 "  --allow-nodeps - ยอมให้ผู้ใช้ติดตั้งแพ็คเกจโดยไม่ต้อง\n"
 "                   ตรวจสอบ ความเป็นอิสระ\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1242,29 +1192,29 @@ msgstr ""
 "  --allow-force  - ยอมให้ผู้ใช้สามารถติดตั้งแพ็คเกจโดยไม่จำเป็นต้อง\n"
 "                   มีการตรวจสอบความเป็นอิสระและความถูกต้อง\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - ใช้ wget เพื่อดึงไฟล์ที่อยู่ภายนอก\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - ใช้ curl เพื่อดึงไฟล์ซึ่งอยู่ภายนอก\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, fuzzy, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1273,7 +1223,7 @@ msgstr ""
 "  --verify-rpm   - ตรวจสอบความถูกต้องของ rpm signature ก่อนการติดตั้ง\n"
 "                   (--no-verify-rpm disable it, default is enabled)\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1282,7 +1232,7 @@ msgstr ""
 "  --proxy        - ใช้ในการกำหนดพร็อกซี่ HTTP หมายเลขพอร์ทสมมุติเป็น\n"
 "                    1080(รูปแบบคือ <proxyhost[:port]>)\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1291,7 +1241,7 @@ msgstr ""
 "  --proxy-user   - กำหนดชื่อผู้ใช้และรหัสผ่านเพื่อใช้พร็อกซี่\n"
 "                   ในการตรวจสอบ (รูปแบบเป็น <user:password>)\n"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1300,12 +1250,12 @@ msgstr ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - ใช้อินเทอร์เฟส X\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1314,7 +1264,7 @@ msgstr ""
 "  --best-output  - เลือกอินเทอร์เฟซที่ดีที่สุดตามสภาพเอ็นไวลอนเม็นท์ของ\n"
 "                   X หรือโหมดตัวอักษร\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1323,73 +1273,62 @@ msgstr ""
 "  --verify-rpm   - ตรวจสอบความถูกต้องของ rpm signature ก่อนการติดตั้ง\n"
 "                   (--no-verify-rpm disable it, default is enabled)\n"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, fuzzy, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --media        - เลือกใช้เฉพาะมีเดียที่ถูกขั้นด้วยเครื่องหมายลูกน้ำ\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr ""
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - เลือกทั้งหมดที่ตรงกับคำสั่งที่พิมพ์\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - ย้อมให้มีการค้นหาแพ็คเกจจากที่ป้อนให้\n"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - ไม่จำเป็นต้องค้นในส่วนแพ็คเกจที่ไว้สำหรับค้นเท่านั้น\n"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - ใช้การค้นหาแบบไม่เจาะจง(เช่นเดียวกับการใช้ --fuzzy).\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s             - แพ็คเกจต่อไปเป็นแพ็คเกจโค้ด (เช่นเดียวกับ --src).\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - โหมดเงียบ\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, fuzzy, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "ชื่อไฟล์หรือชื่อ rpm ที่ให้ไว้ในคำสั่งถูกติดตั้งแล้ว\n"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr ""
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "การแจ้งพร็อกซี่ที่ไม่ดี\n"
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: ตัวเลือกไม่รู้จัก \"-%s\" ตรวจสอบการใช้จาก --help\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1402,22 +1341,22 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "ไม่ต้องทำอะไร"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr ""
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr ""
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1427,54 +1366,54 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, fuzzy, c-format
 msgid "Install it"
 msgstr "การติดตั้งไม่สำเร็จ"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr ""
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "ไม่สามารถสร้างไดเร็คตอรี่ [%s] สำหรับรายงานบัก"
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "superuser เท่านั้นที่มีสิทธิติดตั้ง packages"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "หนึ่งใน Packages ต่อไปนี้ต้องมีในการจะติดตั้ง %s:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "หนึ่งใน Packages ต่อไปนี้ต้องได้รับการติดตั้ง "
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "ต้องการเลือกอะไรครับ  (1-%d) "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr ""
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr ""
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, fuzzy, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1484,12 +1423,12 @@ msgstr ""
 "%s\n"
 "คุณเห็นด้วยหรือไม่?"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr ""
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1500,7 +1439,7 @@ msgstr ""
 "%s\n"
 "คุณยอมให้ทำการลบทิ้งหรือไม่?"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1510,14 +1449,14 @@ msgstr ""
 "%s\n"
 "คุณยอมให้ทำการลบทิ้งหรือไม่?"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr "เพื่อที่จะแก้ใขปัญหาการเข้ากันได้ packages ต่อไปนี้จะถูกติดตั้ง (%d MB)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1526,37 +1465,47 @@ msgstr ""
 "คุณจะต้องเป็นรูทในการติดตั้ง ความเป็นอิสระ :\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "ไม่สามารถเรียก source package,กำลังยกเลิก"
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "กรุณาใส่อุปกรณ์ที่มีชื่อ \"%s\" ใน [%s]"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "กรุณากด enter เมื่อพร้อม"
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, fuzzy, c-format
 msgid "Downloading package `%s'..."
 msgstr "ไม่สามารถที่จะลบแพ็คเกจ %s"
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr ""
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr ""
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "แพ็คเกจต่อไปนี้มี signatures ที่ไม่ถูกต้อง"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "คุณยังต้องการจะติดตั้งอีกต่อไปหรือไม่ ?"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, fuzzy, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1566,57 +1515,57 @@ msgstr ""
 "การติดตั้งล้มเหลวมีบางไฟล์ที่ขาดหายไป\n"
 "ขอแนะนำให้ทำการอัพเดตฐานข้อมูล urpmi"
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "การติดตั้งไม่สำเร็จ"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, fuzzy, c-format
 msgid "distributing %s"
 msgstr "กำลังแจกจ่าย %s\n"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, fuzzy, c-format
 msgid "installing %s"
 msgstr "กำลังติดตั้ง %s\n"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "ต้องการทดลองติดตั้งโดยที่ไม่ต้องตรอจสอบความเข้ากันได้? (y/N)"
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "ต้องการทดลองบังคับติดตั้ง (--force)? (y/N)"
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "การติดตั้งไม่สำเร็จ"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "การติดตั้งสามารถทำได้"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "ทุกอย่างได้ถูกติดตั้งเรียบร้อยแล้ว"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, fuzzy, c-format
 msgid "restarting urpmi"
 msgstr "กำลังติดตั้ง $rpm\n"
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1641,36 +1590,36 @@ msgstr ""
 "\n"
 "and [options] are from\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - สร้างอุปกรณ์เพื่อการอัพเดต\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, fuzzy, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr "  -h             - พยายามค้นหาและใช้ไฟล์ synthesis หรือ hdlist\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, fuzzy, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
 "                   hdlist file.\n"
 msgstr "  -h             - พยายามค้นหาและใช้ไฟล์ synthesis หรือ hdlist\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, fuzzy, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr "  --distrib      - ทำการสร้างมีเดียจากอุปกรณ์สำหรับติดตั้งโดยอัตโนมัติ\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1678,7 +1627,7 @@ msgid ""
 "                   anything else that has been configured ;-)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, fuzzy, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1687,7 +1636,7 @@ msgstr ""
 "  --env          - ใช้เอ็นไวลอนเม็นท์แบบเฉพาะ(โดยทั่วไปใช้กับการรายงาน\n"
 "                   บัก).\n"
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1695,87 +1644,66 @@ msgid ""
 "                   installed mandrake-release package.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
 "                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - ทำความสะอาดส่วน headers ของไดเร็คตอรี่ cache \n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - บังคับการสร้างไฟล์ hdlist\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"ทางเลือกไม่รู้จัก '%s'\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, fuzzy, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "กำลังอ่านข้อมูลไฟล์ rpm..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"ไม่จำเป็นจะต้องให้ <relative path ของ hdlist>กับ -distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "ไม่จำเป็นจะต้องให้ <relative path ของ hdlist>กับ -distrib"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "ไม่สามารถแก้ไขอุปกรณ์\"%s\"\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"ไม่พบ<ลู่ทางที่เกี่ยวข้องของhdlist>\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "ไม่พบ<ลู่ทางที่เกี่ยวข้องของhdlist>\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, fuzzy, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-" `with' ไม่พบสำหรับอุปกรณ์ ftp\n"
+msgid "`with' missing for network media\n"
+msgstr " `with' ไม่พบสำหรับอุปกรณ์ ftp\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "ไม่สามารถสร้างอุปกรณ์ \"%s\"\n"
@@ -1794,6 +1722,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - เลือกมีเดียทั้งหมด\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"ทางเลือกไม่รู้จัก '%s'\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1808,7 +1745,7 @@ msgstr ""
 "ไม่มีข้อมูลที่จะทำการเอาออก\n"
 "(หนึ่งใน %s)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1817,34 +1754,34 @@ msgstr ""
 "การใช้: urpmi.update [options] <name> ...\n"
 "โดยที่ <name> เป็นชื่อของอุปกรณ์ที่ต้องการอัพเดต\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, fuzzy, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - ใช้เพื่ออัพเดตมีเดีย\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr ""
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr " --a          - เลือกมีเดียที่ไม่สามารถเคลื่อนย้ายได้ทั้งหมด \n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "ไม่มีการแก้ไข(use urpmi.addmedia เพื่อเพิ่มอุปกรณ์)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
 "(one of %s)\n"
 msgstr "ขาดข้อมูลที่จะนำไป update(หนึ่งใน %s)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1861,38 +1798,38 @@ msgstr ""
 "\n"
 "usage:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - แสดงรายชื่อแพ็คเกจที่มีอยู่\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media    - แสดงรายชื่ออุปกรณ์ที่มีอยู่\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, fuzzy, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-media    - แสดงรายชื่ออุปกรณ์ที่มีอยู่\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr "  --list-node     - แสดงรายชื่อnodesที่มีอยู่ขณะใช้--parallel \n"
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - แสดงรายชื่อ parallel aliases.\n"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
@@ -1902,30 +1839,30 @@ msgstr ""
 "ไปยัง\n"
 "                   stdout (เฉพาะรูทเท่านั้น).\n"
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr "  --โค้ด      - ให้โค้ดของแพ็คเกจก่อนดาวน์โหลด (เฉพาะรูทเท่านั้น).\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, fuzzy, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr " --all          - พิมพ์ tag ทั้งหมด"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - ขยายการค้นหาให้รวมถึงความเป็นอิสระของโปรแกรม\n"
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -1933,56 +1870,111 @@ msgid ""
 msgstr ""
 "  -u             - ทำการลบแพ็คเกจทิ้งถ้าเวอร์ชั่นล่าสุดได้รับการติดตั้งลงในเครื่องแล้ว\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, fuzzy, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "                  command line แต่ไม่มีชื่อ package)"
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - reverse search to what requires package.\n"
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, fuzzy, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -r             - พิมพ์เวอร์ชั่นกับรีลีสพร้อมชื่อ\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - พิมพ์กลุ่มพร้อมชื่อ\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - พิมพ์เวอร์ชั่นกับรีลีสพร้อมชื่อ\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, fuzzy, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  --list         - แสดงรายชื่อแพ็คเกจที่มีอยู่\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "ชื่อของไฟล์หรือของ rpm ที่ให้จากคำสั่งที่พิมพ์กำลังถูกค้นหา\n"
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: ตัวเลือกไม่รู้จัก \"-%s\",ตรวจสอบการใช้จาก --help\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq:ไม่สามารถอ่าน rpm file \"%s\"\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes can only be used with --parallel"
 
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "webfetch %s ไม่รู้จัก !!!\n"
+
+#, fuzzy
+#~ msgid "copy failed: %s"
+#~ msgstr "...การคัดลอกล้มเหลว"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "wget หายไป\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "wget ล้มเหลว: ออกจากระบบด้วย %d หรือด้วยสัญญาณ %d\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "curl หายไป\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "curl ล้มเหลวออกด้วย %d หรือด้วยสัญญาณ %d\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "rsync หายไป\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "rsync ล้มเหลวออกจากระบบด้วย %d หรือด้วยสัญญาณ %d\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "ssh ไม่มีอยู่\n"
+
+#, fuzzy
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmi: ตัวเลือกไม่รู้จัก \"-%s\" ตรวจสอบการใช้จาก --help\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmi: ตัวเลือกไม่รู้จัก \"-%s\" ตรวจสอบการใช้จาก --help\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr "เพื่อที่จะแก้ใขปัญหาการเข้ากันได้ packages ต่อไปนี้จะถูกติดตั้ง (%d MB)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "ไม่จำเป็นจะต้องให้ <relative path ของ hdlist>กับ -distrib"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "ไม่พบ<ลู่ทางที่เกี่ยวข้องของhdlist>\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ " `with' ไม่พบสำหรับอุปกรณ์ ftp\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmq: ตัวเลือกไม่รู้จัก \"-%s\",ตรวจสอบการใช้จาก --help\n"
+
 #~ msgid "no webfetch (curl or wget currently) found\n"
 #~ msgstr "ไม่พบ webfetch (curl หรือ wget ในขณะนี้)\n"
 
diff --git a/po/tl.po b/po/tl.po
index ef7ac07b..332d6d24 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-tl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2004-03-19 06:09+0800\n"
 "Last-Translator: Arys P. Deloso <arys@deloso.org>\n"
 "Language-Team: Filipino <salinpinoy@list.comitus.net>\n"
@@ -48,22 +48,22 @@ msgstr ""
 "Automatic na pag-i-install ng mga package...\n"
 "Hiniling mo na i-install ang package na %s\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "Ayos ba ito?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "Ayos"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "I-cancel"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (O/h) "
@@ -73,7 +73,7 @@ msgstr " (O/h) "
 msgid "%s: command not found\n"
 msgstr "%s: command hindi nahanap\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
@@ -82,115 +82,54 @@ msgstr ""
 "paggamit: %s [mga_option]\n"
 "kung saan ang [mga_option] ay mula sa\n"
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - i-print itong tulong na mensahe.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "   -g [group]     - i-restrict ang mga resulta sa binigay na group.\n"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, c-format
 msgid "                    defaults is %s.\n"
 msgstr "                    defaults ay %s.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Hindi kilalang webfetch na `%s' !!!\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "hindi kilalang protocol naka-define para sa %s"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "walang nahanap na webfetch, mga suportadong webfetch ay: %s\n"
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "hindi ma-handle ang protocol: %s"
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "pagkopya nabigo: %s"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "wget ay nawawala\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget nabigo: lumabas na may %d o signal na %d\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "curl ay nawawala\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl nabigo: lumabas na may %d o signal na %d\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "rsync ay nawawala\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "rsync nabigo: lumabas na may %d o signal na %d\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "ssh ay nawawala\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% ng %s natapos, ETA = %s, tulin = %s"
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% natapos, tulin = %s"
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...pagkukuha muli nabigo: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "syntax error sa config file sa line %s"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 "medium \"%s\" ay sumusubok gumamit ng gamit na na hdlist, medium di-pinansin"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 "medium \"%s\" ay sumusubok gumamit ng gamit na na list, medium di-pinansin"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -199,39 +138,39 @@ msgstr ""
 "hindi maayos ang medium \"%s\" kasi ang list file ay ginagamit ng ibang "
 "medium"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 "hindi magamit ang \"%s\" para sa walang pangalang medium dahil ginagamit ito"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 "hindi makuha ang medium na \"%s\" sa account dahil walang list file [%s]"
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "hindi malaman ang medium nitong hdlist file [%s]"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "hindi ma-access ang hdlist file ng \"%s\", medium di-pinansin"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "hindi ma-access ang list file ng \"%s\", medium di-pinansin"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "sinusubukang i-bypass ang mayroon nang medium na \"%s\", iniiwasan"
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -240,93 +179,93 @@ msgstr ""
 "virtual medium na \"%s\" ay dapat nag-define ng hdlist o list file, medium "
 "di-pinansin"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr ""
 "virtual medium na \"%s\" ay dapat may malinaw na url, medium di-pinansin"
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "hindi mahanap ang hdlist file para sa \"%s\", medium di-pinansin"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "hindi mahanap ang list file para sa \"%s\", medium di-pinansin"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "incoherent na list file para sa \"%s\", medium di-pinansin"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "hindi masiyasat ang list file para sa \"%s\", medium di-pinansin"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "sobrang daming mount point para sa naaalis na medium na \"%s\""
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "kinukuha ang naaalis na device bilang \"%s\""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "gumagamit ng iba't-ibang naaalis na device [%s] para sa \"%s\""
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "hindi makuha muli ang pathname para sa naaalis na medium \"%s\""
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "hindi maisulat ang config file [%s]"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "isulat ang config file [%s]"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "Hindi magamit ang parallel mode kasama ang use-distrib mode"
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "hindi ma-parse ang \"%s\" sa file [%s]"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "sinusuri ang parallel handler sa file [%s]"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "nakahanap ng parallel handler para sa mga node: %s"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "ginagamit ang kasamahang media para sa parallel mode: %s"
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "hindi magamit ang parallel option na \"%s\""
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -335,90 +274,90 @@ msgstr ""
 "--synthesis ay hindi magagamit kasama ang --media, --excludemedia,--"
 "sortmedia, --update o --parallel"
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "sinusuri ang synthesis file [%s]"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "sinusuri ang hdlist file [%s]"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "virtual medium na \"%s\" ay hindi local, medium di-pinansin"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "problema sa pagbabasa ng hdlist o synthesis file ng medium na \"%s\""
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "nagsasagawa ng pangalawang pagdaan para i-compute ang mga dependency\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "nilalaktawan ang package na %s"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "i-install imbis na i-upgrade ang package na %s"
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "hindi mabuksan ang rpmdb"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "medium na \"%s\" ay mayroon na"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr "virtual medium ay kailangang local"
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "idinagdag ang medium na %s"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "hindi ma-access ang unang installation medium"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "kinokopya ang hdlists file..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "...pagkokopya nabigo"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "...pagkokopya natapos"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
@@ -427,43 +366,49 @@ msgstr ""
 "hindi ma-access ang unang installation medium (walang Mandrake/base/hdlists "
 "na file)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "kinukuha muli ang hdlists file..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "...pagkukuha muli natapos"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...pagkukuha muli nabigo: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "hindi balidong paglalarawan ng hdlist na \"%s\" sa hdlists file"
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "sinusubukang piliin ang di-mayroong medium na \"%s\""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "pumipili ng maramihang media: %s"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "inaalis ang medium na \"%s\""
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -474,7 +419,7 @@ msgstr ""
 "ito ay mangyayari kung mano-mano mong in-mount ang directory noong ginagawa "
 "ang medium."
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -483,222 +428,222 @@ msgstr ""
 "virtual medium na \"%s\" ay dapat may balidong source hdlist o synthesis, "
 "medium di-pinansin"
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "kinokopya ang paglalarawan na file ng \"%s\"..."
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "kino-compute ang md5sum ng mayroong source hdlist (o synthesis)"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "sinusuri ang MD5SUM file"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "kinokopya ang source hdlist (o synthesis) ng \"%s\"..."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "pagkopya ng [%s] nabigo (file ay kahina-hinalang maliit)"
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "kino-compute ang md5sum ng nakopyang source hdlist (o synthesis)"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "pagkopya ng [%s] nabigo (md5sum di-tugma)"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "problema sa pagbabasa ng synthesis file ng medium na \"%s\""
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "binabasa ang mga rpm file mula sa [%s]"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "hindi mabasa ang mga rpm file mula sa [%s]: %s"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "walang nahanap na rpm file mula sa [%s]"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "kinukuha muli ang source hdlist (o synthesis) ng \"%s\"..."
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "nahanap ang sinuring hdlist (o synthesis) bilang %s"
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "kino-compute ang md5sum ng nakuhang source hdlist (o synthesis)"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr "md5sum di-tugma"
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "pagkuha muli ng source hdlist (o synthesis) nabigo"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "walang nahanap na hdlist file para sa medium na \"%s\""
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "file na [%s] ay ginagamit na sa parehong medium na \"%s\""
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "hindi ma-parse ang hdlist file ng \"%s\""
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "hindi maisulat ang list file ng \"%s\""
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "isinusulat ang list file para sa medium na \"%s\""
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "walang naisulat sa list file para sa \"%s\""
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "sinusuri ang pubkey file ng \"%s\"..."
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...in-import ang key na %s mula sa pubkey file ng \"%s\""
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "hindi ma-import ang pubkey file ng \"%s\""
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "binabasa ang mga header mula sa medium na \"%s\""
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "binubuo ang hdlist [%s]"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "nakabuo ng hdlist synthesis file para sa medium na \"%s\""
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "nahanap %d header sa cache"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "inaalis ang %d obsolete na header sa cache"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "mina-mount ang %s"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "ina-unmount ang %s"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "nilipat ang %s entry sa depslist"
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "walang nilipat na entry sa depslist"
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "inbalidong pangalan ng rpm file [%s]"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "kinukuha muli ang rpm file [%s] ..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "hindi ma-access ang rpm file [%s]"
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "hindi mairehistro ang rpm file"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "error sa pagrerehistro ng mga local package"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "walang package na may pangalang %s"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Ang mga sumusunod na package ay naglalaman ng %s: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "may maramihang package na may parehong pangalan ng rpm file \"%s\""
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "hindi ma-parse ng tama ang [%s] sa halaga na \"%s\""
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -708,63 +653,63 @@ msgstr ""
 "  siguro hindi na-update ang mirror, sinusubukang gamitin ang alternatibong "
 "paraan"
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr ""
 "medium na \"%s\" ay hindi nagde-define ng lokasyon para sa mga rpm file"
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "package na %s ay hindi nahanap."
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi database ay naka-lock"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "medium na \"%s\" ay hindi nakapili"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "hindi mabasa ang rpm file na [%s] mula sa medium na \"%s\""
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "incoherent na medium na \"%s\" may markang naaalis pero hindi naman"
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "hindi ma-access ang medium na \"%s\""
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "sirang anyo ng input: [%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "kinukuha muli ang mga rpm file mula sa medium na \"%s\"..."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "Naghahanda..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "ginagamit ang proseso na %d para sa pagpapatupad ng transaksyon"
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -772,82 +717,97 @@ msgstr ""
 "gumawa ng transaksyon para sa pag-i-install sa %s (alisin=%d, i-install=%d, "
 "i-upgrade=%d)"
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr "hindi magawa ang transaksyon"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "inaalis ang package na %s"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "hindi maalis ang package na %s"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "idinadagdag ang package na %s (id=%d, eid=%d, update=%d, file=%s)"
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "hindi ma-install ang package na %s"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "dahil sa nawawalang %s"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "dahil sa hindi na-satisfy na %s"
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr "sinusubukang i-promote ang %s"
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr "para maitago ang %s"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "para ma-install ang %s"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "dahil sa pagkakasalungat sa %s"
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr "hindi hiniling"
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Inbalidong signature (%s)"
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "Inbalidong Key ID (%s)"
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Nawawalang signature (%s)"
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "masamang pagdeklara ng proxy sa command line\n"
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: hindi mabasa ang rpm file na \"%s\"\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Sorry, masamang pili, subukan muli\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -864,25 +824,25 @@ msgstr ""
 "\n"
 "paggamit:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - i-print itong tulong na mensahe.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 "  --auto         - automatic na pumili ng package sa mga pagpipilian.\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr "  --test         - subukan kung makakamit ng tama ang pag-i-install.\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
@@ -890,20 +850,20 @@ msgstr ""
 "  --force        - pilitin ang imbokasyon kahit na wala ang ilang mga "
 "package.\n"
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 "  --parallel     - distributed/nakapamahagi na urpmi sa mga makina ng "
 "alias.\n"
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr ""
 "  --root         - gumamit ng ibang root para sa pag-i-install ng rpm.\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -914,75 +874,64 @@ msgstr ""
 "                   tree, magagamit para sa mag-(un)install ng chroot na may\n"
 "                   option na --root.\n"
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - masalita na paraan.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 "  -a             - piliin lahat ng package na tumutugma sa expression.\n"
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-"urpme: di-kilalang option na \"-%s\", suriin ang paggamit gamit ang --help\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr "hindi kilalang mga package"
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "hindi kilalang package"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "ang pag-aalis ng package na %s ay sisira ng sistema mo"
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr "Walang maaalis"
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "Nagsusuri para alisin ang mga sumusunod na package"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
 "Para ma-satisfy ang dependency, ang sumusunod na package ay aalisin (%d MB)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (o/H) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "inaalis ang %s"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr "Pag-aalis nabigo"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Sorry, masamang pili, subukan muli\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -999,25 +948,25 @@ msgstr ""
 "\n"
 "paggamit:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - gamitin lang ang update media.\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 "  --media        - gamitin lang ang binigay na media, hiniwilay ng comma/"
 "kuwit.\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 "  --excludemedia - huwag gamitin ang binigay na media, hiniwalay ng kuwit.\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1025,19 +974,19 @@ msgstr ""
 "  --sortmedia    - iayos ang media ayon sa mga substring na hiniwalay ng "
 "kuwit.\n"
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - gamitin ang binigay na synthesis imbis na urpmi "
 "database.\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - masalita na paraan.\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1048,88 +997,88 @@ msgstr ""
 "                   binigay na tag sa command line, hindi kasundo ang\n"
 "                   interactive na mode o paraan).\n"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --uniq         - huwag i-print ang mga magkatulad na linya.\n"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all          - i-print lahat ng mga tag.\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group        - i-print ang tag group: grupo.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size         - i-print ang tag size: laki.\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --epoch        - i-print ang tag epoch: epoch.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary      - i-print ang tag summary: kabuuan.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description  - i-print ang tag description: paglalarawan.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr "  --sourcerpm    - i-print ang tag sourcerpm: source rpm.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr "  --packager     - i-print ang tag packager: taga-package.\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr "  --buildhost    - i-print ang tag buildhost: build host.\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --url          - i-print ang tag url: url.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr "  --provides     - i-print ang tag provides: lahat ng binibigay.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr "  --requires     - i-print ang tag requires: lahat ng kinakailangan.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files        - i-print ang tag files: lahat ng file.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr ""
 "  --conflicts    - i-print ang tag conflicts: lahat ng pagkakasalungat.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr "  --obsoletes    - i-print ang tag obsoletes: lahat ng pinapalaos.\n"
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
@@ -1139,14 +1088,14 @@ msgstr ""
 "(karaniwan\n"
 "                   ay isang ulat sa bug).\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
 "  -i             - balewalain ang pagkakaiba ng case/laki ng titik sa bawat\n"
 "                   pattern o parisan.\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
@@ -1154,12 +1103,12 @@ msgstr ""
 "arkitektura\n"
 "                   kasama ang pangalan.\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - isama nang direkta ang perl code bilang perl -e.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
@@ -1167,7 +1116,7 @@ msgstr ""
 "  -a             - binary AND operator, totoo kung parehong expression ay "
 "totoo.\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
@@ -1175,25 +1124,25 @@ msgstr ""
 "  -o             - binary OR operator, totoo kung isang expression ay "
 "totoo.\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - unary NOT, totoo kung expression ay hindi totoo.\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
 "  (              - kaliwang parenthesis para buksan ang grupo ng "
 "expression.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
 "  )              - kanang parenthesis para isara ang grupo ng expression.\n"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
@@ -1202,12 +1151,12 @@ msgstr ""
 "ang callback ay :\n"
 "%s\n"
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "ginagamit ang specific environment sa %s\n"
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1224,14 +1173,14 @@ msgstr ""
 "\n"
 "paggamit:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - gamitin ang binigay na synthesis imbis na urpmi "
 "database.\n"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
@@ -1239,7 +1188,7 @@ msgstr ""
 "  --auto-select  - piliin kaagad ang mga package para i-upgrade ang "
 "sistema.\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
@@ -1247,7 +1196,7 @@ msgid ""
 msgstr ""
 "  --no-uninstall - huwag itanong kung alisin ang package, huwag magpatuloy.\n"
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1256,7 +1205,7 @@ msgstr ""
 "  --keep         - ingatan ang mga package na mayroon na, tanggihan\n"
 "                   ang mga hiniling na package kung magkakaroon ng aalisin.\n"
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1268,39 +1217,39 @@ msgstr ""
 "                   na mga package ay ii-install o ia-upgrade,\n"
 "                   default ay %d.\n"
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - haba ng maliit na transaksyon, default ay %d.\n"
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - igiit ang fuzzy na paghahanap (pareho ng -y).\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 "  --src          - ang kasunod na package ay source package (pareho ng -s).\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 "  --install-src  - i-install ang source package lamang (walang mga binary).\n"
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - alisin ang rpm sa cache bago pa ang kung ano.\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - ingatan ang rpm na hindi ginagamit sa cache.\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1310,7 +1259,7 @@ msgstr ""
 "package\n"
 "                   na hindi sinusuri ang mga dependency.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1320,7 +1269,7 @@ msgstr ""
 "package\n"
 "                   na hindi sinusuri ang mga dependency at integridad.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1331,24 +1280,24 @@ msgstr ""
 "                   tree, magagamit para sa mag-install ng chroot na may\n"
 "                   option na --root.\n"
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 "  --wget         - gamitin ang wget para kunin ang mga malayong file.\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 "  --curl         - gamitin ang curl para kunin ang mga malayong file.\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - limitahan ang tulin ng pagda-download.\n"
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1359,7 +1308,7 @@ msgstr ""
 "                   (--no-resume ay dini-disable ito, default ay naka-"
 "disable).\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1370,7 +1319,7 @@ msgstr ""
 "                   ipinagpalagay na 1080 bilang default\n"
 "                   (format ay <proxyhost[:port]>).\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1380,7 +1329,7 @@ msgstr ""
 "proxy\n"
 "                   authentication (format ay <user:password>).\n"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1389,12 +1338,12 @@ msgstr ""
 "  --bug          - maglabas ng ulat ng bug sa directory na binanggit ng\n"
 "                   kasunod na argument.\n"
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - gamitin ang X interface.\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1403,7 +1352,7 @@ msgstr ""
 "  --best-output  - piliin ang pinakamabuting interface ayon sa environment:\n"
 "                   X o text mode.\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1413,81 +1362,69 @@ msgstr ""
 "                   (--no-verify-rpm ay idi-disable ito, default ay "
 "gumagana).\n"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - huwag isama ang path na hiniwalay ng comma/kuwit.\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - huwag isama ang mga docs file.\n"
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - piliin lahat ng katugma sa command line.\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 "  -p             - payagang maghanap sa provides para hanapin ang package.\n"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 "  -P             - huwag maghanap sa provides para hanapin ang package.\n"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 "  -y             - igiit ang fuzzy na paghahanap (pareho ng --fuzzy).\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 "  -s             - ang kasunod na package ay source package (pareho ng --"
 "src).\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - tahimik na paraan.\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 "  ang mga pangalan o rpm file na binigay sa command line ay ii-install.\n"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr "Piliin ang lugar kung saan ise-save ang file"
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "masamang pagdeklara ng proxy sa command line\n"
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-"urpmi: di-kilalang option na \"-%s\", suriin ang paggamit gamit ang --help\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 "Ano ang magagawa sa mga binary rpm file kung ginagamit ang --install-src"
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1512,22 +1449,22 @@ msgstr ""
 "\n"
 "Ano ang gusto mong gawin?"
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "Walang gawin"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr "Oo, talagang i-install ito"
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr "I-save ang file"
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1542,12 +1479,12 @@ msgstr ""
 "\n"
 "Pwede mong naising i-save na lang ito. Ano ang pili mo?"
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, c-format
 msgid "Install it"
 msgstr "I-install ito"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1556,42 +1493,42 @@ msgstr ""
 "Directory na [%s] ay meron na, gumamit ng ibang directory para sa ulat ng "
 "bug o alisin ito"
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Hindi magawa ang directory na [%s] para sa ulat ng bug"
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Superuser lamang ang pinapayagang mag-install ng mga package"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "Isa sa mga sumusunod na package ay kailangan para i-install ang %s:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Isa sa mga sumusunod na package ay kailangan:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Ano ang pili mo? (1-%d) "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "Pag-i-install ng package..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "Ini-initialize..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1600,12 +1537,12 @@ msgstr ""
 "Ilang package na hiniling ay hindi ma-install:\n"
 "%s"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr "sumasang-ayon ka ba?"
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1616,7 +1553,7 @@ msgstr ""
 "package ay dapat alisin para ma-upgrade ang iba:\n"
 "%s\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1625,16 +1562,16 @@ msgstr ""
 "Ang mga sumusunod na package ay dapat alisin para ma-upgrade ang iba:\n"
 "%s"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
 "Para ma-satisfy ang dependency, ang sumusunod na package ay ii-install (%d "
 "MB)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1643,37 +1580,47 @@ msgstr ""
 "Kailangan mong maging root para i-install ang mga sumusunod na dependency:\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "hindi makuha ang mga source package, hindi tumutuloy"
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Pakisuksok ang medium na may pangalang \"%s\" sa device na [%s]"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Pindutin ang Enter kung handa na..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Dina-download ang package na `%s'..."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% ng %s natapos, ETA = %s, tulin = %s"
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% natapos, tulin = %s"
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Ang mga sumusunod na package ay may masamang signature"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Gusto mong ituloy ang pag-i-install ?"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1684,57 +1631,57 @@ msgstr ""
 "%s\n"
 "Baka gusto mong i-update ang iyong urpmi database"
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "Pag-i-install ay nabigo"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr "dini-distribute ang %s"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr "ini-install ang %s"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Ini-install ang package na `%s' (%s/%s)..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Subukan ang pag-i-install na hindi sinusuri ang mga dependency? (o/H) "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Subukan ang pag-i-install nang mas malakas (--force)? (o/H) "
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d transaksyong pag-i-install ay nabigo"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "Pag-i-install ay maaari"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "Lahat ay naka-install na"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr "sinisimulan muli ang urpmi"
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1760,23 +1707,23 @@ msgstr ""
 "\n"
 "at ang [mga_option] ay mula sa\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - gumawa ng update medium.\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
 "  --probe-synthesis - subukang hanapin at gamitin ang synthesis file.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr "  --probe-hdlist - subukang hanapin at gamitin ang hdlist file.\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
@@ -1784,7 +1731,7 @@ msgid ""
 msgstr ""
 "  --no-probe     - huwag subukang maghanap ng synthesis o hdlist file.\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -1794,7 +1741,7 @@ msgstr ""
 "installation\n"
 "                   medium.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1806,7 +1753,7 @@ msgstr ""
 "o\n"
 "                   kahit ano na na-configure ;-)\n"
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1816,7 +1763,7 @@ msgstr ""
 "mirror,\n"
 "                   default ay %s\n"
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1828,7 +1775,7 @@ msgstr ""
 "ng\n"
 "                   naka-install na mandrake-release package.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
@@ -1838,7 +1785,7 @@ msgstr ""
 "ng\n"
 "                   mandrake-release package na naka-install.\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
@@ -1847,73 +1794,53 @@ msgstr ""
 "  --virtual      - gumawa ng virtual media na parating naka-update,\n"
 "                   ang file:// protocol lamang ang pinahihintulutan.\n"
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - i-disable ang MD5SUM na pagsusuri ng file.\n"
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - linisin ang headers cache directory.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - pilitin ang paggawa ng mga hdlist file.\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"mga hindi kilalang option '%s'\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "hindi maidagdag ang mga update ng distribusyon ng cooker\n"
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "kinukuha ang mga mirror sa %s ..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr ""
-"%s\n"
 "hindi kailangang ibigay ang <relative path ng hdlist> kasama ang --distrib"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "hindi ma-update ang medium na \"%s\"\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"<relative path ng hdlist> ay nawawala\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<relative path ng hdlist> ay nawawala\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"`with' nawawala para sa network media\n"
+msgid "`with' missing for network media\n"
+msgstr "`with' nawawala para sa network media\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "hindi magawa ang medium na \"%s\"\n"
@@ -1932,6 +1859,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - piliin lahat ng media.\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"mga hindi kilalang option '%s'\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1946,7 +1882,7 @@ msgstr ""
 "ang entry na aalisin ay nawawala\n"
 "(isa sa mga %s)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1955,29 +1891,29 @@ msgstr ""
 "paggamit: urpmi.update [mga_option] <pangalan> ...\n"
 "kung saan ang <pangalan> ay pangalan ng medium na ia-update.\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - i-update ang update media lamang.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr "  --force-key    - pilitin ang pag-update ng gpg key.\n"
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 "  -a             - piliin lahat ng non-removable (hindi naaalis) na media.\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "walang ia-update (gamitin ang urpmi.addmedia para magdagdag ng media)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1986,7 +1922,7 @@ msgstr ""
 "ang entry na ia-update ay nawawala\n"
 "(isa sa mga %s)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -2003,42 +1939,42 @@ msgstr ""
 "\n"
 "paggamit:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - ilista ang mga available na package.\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - ilista ang mga available na media.\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr ""
 "  --list-url     - ilista ang mga available na media at kanilang URL.\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 "  --dump-config  - i-dump ang config sa anyo na argument ng urpmi.addmedia.\n"
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 "  --list-nodes   - ilista ang mga available node kung ginagamit ang --"
 "parallel.\n"
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - ilista ang mga available na parallel alias.\n"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
@@ -2048,7 +1984,7 @@ msgstr ""
 "sa\n"
 "                   urpmi database papuntang stdout (root lang).\n"
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
@@ -2056,7 +1992,7 @@ msgstr ""
 "  --sources      - ibigay lahat ng source package bago i-download (root "
 "lang).\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
@@ -2066,17 +2002,17 @@ msgstr ""
 "distrib\n"
 "                   tree. Ito ay magpapahintulot na tanungin ang distro.\n"
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - i-print ang changelog.\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - ipaabot ang tanong sa package dependencies.\n"
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -2085,12 +2021,12 @@ msgstr ""
 "  -u             - alisin ang package kung may mas bagong version na\n"
 "                   naka-install.\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - kompletong output kasama ang package na aalisin.\n"
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
@@ -2098,47 +2034,106 @@ msgstr ""
 "ng\n"
 "                   package.\n"
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 "  -i             - mag-print ng kapakipakinabang na inpormasyon sa anyong\n"
 "                   nababasa ng tao.\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - i-print ang mga grupo na may pangalan din.\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr ""
 "  -r             - i-print ang version at release na may pangalan din.\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - ilista ang mga file sa package.\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 "  ang mga pangalan o rpm file na binigay sa command line ay tatanungin.\n"
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-"urpmq: di-kilalang option na \"-%s\", suriin ang paggamit gamit ang --help\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: hindi mabasa ang rpm file na \"%s\"\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes ay magagamit lang kasama ang --parallel"
+
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "Hindi kilalang webfetch na `%s' !!!\n"
+
+#~ msgid "copy failed: %s"
+#~ msgstr "pagkopya nabigo: %s"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "wget ay nawawala\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "wget nabigo: lumabas na may %d o signal na %d\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "curl ay nawawala\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "curl nabigo: lumabas na may %d o signal na %d\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "rsync ay nawawala\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "rsync nabigo: lumabas na may %d o signal na %d\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "ssh ay nawawala\n"
+
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpme: di-kilalang option na \"-%s\", suriin ang paggamit gamit ang --"
+#~ "help\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpmi: di-kilalang option na \"-%s\", suriin ang paggamit gamit ang --"
+#~ "help\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr ""
+#~ "Para ma-satisfy ang dependency, ang sumusunod na package ay ii-install (%"
+#~ "d MB)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "hindi kailangang ibigay ang <relative path ng hdlist> kasama ang --distrib"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "<relative path ng hdlist> ay nawawala\n"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "`with' nawawala para sa network media\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpmq: di-kilalang option na \"-%s\", suriin ang paggamit gamit ang --"
+#~ "help\n"
diff --git a/po/tr.po b/po/tr.po
index 8e77662b..d76dde59 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2004-01-26 05:48+0200\n"
 "Last-Translator: Ömer Fadıl USTA <omer_fad@hotmail.com>\n"
 "Language-Team: Turkish <mandrakei18n@yahoogroups.com>\n"
@@ -58,22 +58,22 @@ msgstr ""
 "Otomatik paket kurulumu...\n"
 "%s paketinin kurulmasını istemiştiniz.\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "Tamam mı?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "Tamam"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "İptal"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (E/h) "
@@ -83,121 +83,60 @@ msgstr " (E/h) "
 msgid "%s: command not found\n"
 msgstr "%s: komut bulunamadı\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "where [options] are from\n"
 msgstr ""
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - bu yardım mesajını görüntüler.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, fuzzy, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "  --group        - grup etiketini yaz: grup.\n"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, fuzzy, c-format
 msgid "                    defaults is %s.\n"
 msgstr "  -a             - tüm ortamları seçer.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Bilinmeyen webfetch `%s' !!!\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "%s için bilinmeyen protokol tanımlanmış"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "%s protokolü ile ilgilenemiyor"
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "kopyalama başarısız: %s"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "wget kayıp\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget başarısız: %d ile veya %d sinyali ile çıkıldı.\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "curl kayıp\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl başarısız: %d ile veya %d sinyali ile çıkıldı\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "rsysnc kayıp\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "rsync başarısız: %d ile veya %d sinyali ile çıkıldı\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "ssh kayıp\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%%'nin %s'i tamamlandı, Kalan Süre = %s, Hız = %s"
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% tamamlandı, hız = %s"
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...getirme başarısız: [%s]"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "yapılandırma dosyasının %s satırında sözdizimi hatası"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 "\"%s\" ortamı, halen kullanımdaki hdlist'i kullanmaya çalışıyor, yoksayıldı"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr "\"%s\" kullanımda olan listeyi kullanmaya çalışıyor, yoksayıldı"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -206,219 +145,219 @@ msgstr ""
 "liste dosyası başka ortam tarafından kullanıldığından \"%s\" ile "
 "çalışılamıyor"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr "kullanımda olduğundan isimsiz ortam için \"%s\" ismi kullanılamıyor"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr "\"%s\" ortamı, liste dosyası [%s] olmadığından hesap içine alınamıyor"
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "hdlist dosyasının [%s] ortamı saptanamıyor"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "\"%s\" ortamının hdlist dosyasına erişilemiyor, yoksayıldı"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "\"%s\" ortamının liste dosyasına erişilemiyor, yoksayıldı"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "varolan \"%s\" ortamı atlanmaya çalışılırken engelleniyor"
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
 "ignored"
 msgstr ""
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "\"%s\" için sabit disk listesi dosyası bulunamıyor, ortam yoksayıldı"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "\"%s\" için liste dosyası bulunamıyor, ortam yoksayılıyor"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "\"%s\" için liste dosyası tutarsız, ortam yoksayıldı"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "\"%s\" için liste dosyası denetlenemiyor, ortam yoksayıldı"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "\"%s\" çıkarılabilir ortam için çok bazla bağlantı noktası tanımlı"
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "\"%s\" çıkarılabilir aygıt olarak alındı."
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "Farklı %s çıkarılabilir aygıtları %s için  kullanılıyor"
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "\"%s\" ayrılabilir aygıtı için yolismi ele alınamadı"
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "yapılandırma dosyasına [%s] yazılamıyor"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "yapılandırma dosyası [%s] yazılıyor"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "\"%2$s\" dosyasındaki \"%1$s\" ayrıştırılamıyor"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "\"%s\" dosyasındaki paralel işleyici inceleniyor"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "düğümler için paralel işleyici bulundu: %s"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "paralel mod için ortak ortam kullanılıyor: %s"
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "paralel seçenek \"%s\" kullanılamadı"
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
 "update or --parallel"
 msgstr ""
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "sentez dosyası [%s] inceleniyor"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "sabit disk listesi(hdlist) dosyası [%s] okunuyor"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "bağımlılıkların hesaplanması için ikinci geçiş yapılıyor\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "%s paketi atlanıyor"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr ""
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "rpmdb açılamıyor"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "\"%s\" ortamı zaten var"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr ""
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "%s ortamı eklendi"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "İlk kurulum ortamına erişilemiyor"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "hdlist dosyaları kopyalanıyor..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "...kopyalama başarısız"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "...kopyalama tamamlandı"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
@@ -426,43 +365,49 @@ msgid ""
 msgstr ""
 "İlk kurulum ortamına erişilemiyor ( Mandrake/base/hdlists dosyası bulunamadı)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "hard disk rpm listesi (hdlists) alınıyor..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "...ele alma tamamlandı"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...getirme başarısız: [%s]"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "sabit disk listesi dosyasındaki sabit disk açıklaması %s geçersiz"
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "Çoklu medya seçiliyor: %s"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "aygıt kaldırılıyor \"%s\""
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -470,373 +415,388 @@ msgid ""
 "medium."
 msgstr ""
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
 "ignored"
 msgstr ""
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "\"%s\"in açıklama dosyası kopyalanıyor..."
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr ""
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "MD5SUM dosyası sınanıyor"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "\"%s\" in kaynak hdlisti (ya da sentezi) kopyalanıyor..."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr ""
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, fuzzy, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "[%s] kopyalaması başarısız"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "\"%s\" için sabit disk listesi sentezleme dosyasının okunmasında hata"
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "rpm dosyaları [%s]'den okunuyor"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "[%s]'den rpm dosyaları okunamadı: %s"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "[%s] de rpm dosyaları yok"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "\"%s\" in kaynak hdlisti (ya da sentezi) getiriliyor..."
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "incelenmiş hdlist (yada sentez) %s olarak bulundu"
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr ""
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr ""
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "kaynak sabit disk listesi (ya da sentez) dosyası alımı başarısız oldu"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "\"%s\" için sabit disk listesi dosyası bulunamadı"
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "%s dosyası %s ortamında zaten kullanılmış"
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "\"%s\" sabit disk listesi dosyası ayrıştırılamıyor"
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "\"%s\" liste dosyası yazılamıyor"
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "\"%s\" için listesi dosyası yazılıyor"
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "\"%s\" için liste dosyasına hiçbir şey yazılmamış"
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "\"%s\" ortamından başlıklar okunuyor"
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "sabit disk listesi [%s] oluşturuluyor"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "\"%s\" için sabit disk listesi sentezleme dosyası oluşturuldu."
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "arabellekte %d başlığı bulundu"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "arabellekteki %d eski başlık kaldırılıyor"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "%s bağlanıyor"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "%s ayrılıyor"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "bağımlılıklar listesindeki %s girdileri yeniden konumlandırıldı"
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "bağımlılıklar listesindeki hiç bir giriş yeniden konumlanamadı"
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "rpm dosya ismi [%s] geçersiz"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "Rpm dosyası [%s] getiriliyor..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "rpm dosyasına [%s] erişilemiyor"
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "rpm dosyası kayıt edilemiyor"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "yerel paketlerin sicil kaydı yapılırken hata"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "%s adında bir paket yok"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Bu paketler %s içeriyor: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "aynı \"%s\" isminde çok sayıda rpm paketi var."
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "[%s] (\"%s\" değerindeki) düzgün ayrıştırılamıyor"
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
 "  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "ortam \"%s\" rpm dosyaları için herhangi bir yer belirtmiyor"
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "%s paketi bulunamadı."
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi veri tabanı kilitlendi"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "\"%s\" seçilmedi"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "rpm dosyası [%s] \"%s\" ortamından okunamıyor"
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 "tutarsız ortam \"%s\" kaldırılabilir olarak imlenmiş ama bu doğru değil"
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "\"%s\" ortamına erişilemiyor"
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "bozuk girdi: [%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "rpm dosyaları ortamdan alınıyor \"%s\"..."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "Hazırlanıyor..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr ""
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr ""
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "%s paketi kaldırılıyor"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "paket kalırılamıyor: %s"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr ""
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "%s paketi yüklenemiyor"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "%s paketinin kayıplığından"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "%s' den dolayı yetersiz"
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr ""
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr ""
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "sıradaki kurulum %s"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "%s paketi ile çelişkisinden"
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr "talep edilmemiş"
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Geçersiz imza (%s)"
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "Geçersiz Anahtar ID'si (%s)"
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr ""
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "komut satırından kötü vekil sunucu bildirimi\n"
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: \"%s\" rpm dosyası okunamıyor\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Üzgünüm ,hatalı seçim, tekrar deneyin\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -852,24 +812,24 @@ msgstr ""
 "\n"
 "kullanımı:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - bu yardım mesajını görüntüler.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - Otomatik seçenekler arasından paketleri seç.\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr "  --test         - kurulumun başarılı olup olmayacağını doğrula.\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
@@ -877,91 +837,81 @@ msgstr ""
 "  --force        - bazı paketlerin bulunamama durumda bile işlemin\n"
 "                   devamına zorla.\n"
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - dağıtık urpmi (accross machines of alias).\n"
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr ""
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - kalabalık kipi.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - ifadeye uyan tüm paketleri seçer. \n"
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: \"-%s\" seçeneği bilinmiyor, ayrıntılı bilgi için --help\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr "bilinmeyen paketler "
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "bilinmeyen paket"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "%s paketinin kaldırılması sisteminizi göçertir"
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr "Kaldırılacak bir şey yok"
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "Kaldırılmak için sıradaki paketler sınanıyor"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
 "Bağımlılık sorununu aşabilmek için, aşağıdaki paketlerin kaldırılması "
 "gerekiyor (%d Mb)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " ( y, e / H , N ) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "%s kaldırılıyor"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr "Kaldırma başarısız"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Üzgünüm ,hatalı seçim, tekrar deneyin\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -977,39 +927,39 @@ msgstr ""
 "\n"
 "Kullanımı:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - sadece güncelleme ortamını kullan.\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 "  --media       - sadece belirtilen ortamları kullan (virgülle ayırın).\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr "  --synthesis    - urpmi veritabanı yerine verilen bireşimi kullan.\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose             - kalabalık kipi.\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1020,87 +970,87 @@ msgstr ""
 "tanımlıdır\n"
 "                   satır, etkileşimli durum ile uyumlu değil).\n"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr ""
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all           - tüm etiketler yazır.\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group        - grup etiketini yaz: grup.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size         - boyut etiketini yaz: boyut.\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --epoch        - tarih etiketini yaz: tarih.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary      - özet etiketini yaz: özet..\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description  - açıklama etiketini yaz: açıklama.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr ""
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr ""
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr ""
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr ""
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr ""
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr ""
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr ""
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr ""
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
@@ -1109,52 +1059,52 @@ msgstr ""
 "  --env          - belirli bir çevre kullan (genellikle bir\n"
 "                   hata raporu).\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
 "  -i             - her örnekte büyük-küçük harf farklılığını göz ardı et.\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - isminin yanında sürüm ve kurnazlığını yazar.\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - perl kocunu doğrudan perl olarak ekle -e.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 "  -a             - ikili AND operatörü, her iki ifade de doğru ise doğru.\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 "  -o             - ikili OR operatör, ifadelerden biri doğru ise doğru.\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - tekli NOT, ifade yanlış ise doğru.\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr "  (              - grup ifadesini açmak için sol parantez.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr "  )              - grup ifadesini kapatmak için sağ parantez.\n"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
@@ -1163,12 +1113,12 @@ msgstr ""
 "gelidönüş :\n"
 "%s\n"
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "%s' de belirtilen ortam kullanılıyor\n"
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1183,33 +1133,33 @@ msgstr ""
 "Bu bir serbest yazılımdır ve GNU GPL Lisansı altında tekrar dağıtılabilir.\n"
 "kullanım:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - urpmi veri tabanı yerine belirtilen sentezi kullan.\n"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - Sistemi güncellemek için paketleri otomatik seç.\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr ""
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that leads to remove.\n"
 msgstr ""
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1217,39 +1167,39 @@ msgid ""
 "                   default is %d.\n"
 msgstr ""
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy         - hatalı aramaya zorla (-y ile aynı)\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 "  --src          -  ardından gelen paket bir kaynak paketi ( -s ile aynı).\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 "  --install-src  - sadece kaynak kodu paketlerini kur (binaryleri değil).\n"
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - herhangi birşeyden önce rpm'yi önbellekten sil.\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - rpm'yi ön bellekte kullanılmadan sakla\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1258,7 +1208,7 @@ msgstr ""
 "  --allow-nodeps - kullanıcıya bağımlılıkları sormadan kuruluma\n"
 "                   izin verir.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1267,29 +1217,29 @@ msgstr ""
 "  --allow-force  - kullanıcıya bağımlılıkları ve diğer olumsuzlukları\n"
 "                   sormadan kuruluma izin verir.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - uzaktaki dosyaları almak için wget kullan.\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - uzak dosyaları almak için curl kullan.\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - indirme hızını kısıtlama.\n"
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, fuzzy, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1298,7 +1248,7 @@ msgstr ""
 "  --verify-rpm   - kurulumdan önce rpm imzasını doğrula\n"
 "                   (--no-verify-rpm bunu iptal eder, öntanımlı etkindir).\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1308,7 +1258,7 @@ msgstr ""
 "                   varsayılan olan 1080 kabul edilecek (biçim <vekilsunucu[:"
 "port]>).\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1317,7 +1267,7 @@ msgstr ""
 "  --proxy-user   - vekil sunucu kimlik denetimi için kullanıcı adı\n"
 "                   ve parola belirtin (biçim <kullanıcıadı:parola>).\n"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1326,12 +1276,12 @@ msgstr ""
 "  --bug          - sonraki argüman tarafından belirtilen dizini bir\n"
 "                   hata raporu oluştur.\n"
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - X arayüzünü kullan.\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1340,7 +1290,7 @@ msgstr ""
 "  -best-output   - işlem için en iyi arayüzü seç : \n"
 "                   X veya metin kipi.\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1349,78 +1299,67 @@ msgstr ""
 "  --verify-rpm   - kurulumdan önce rpm imzasını doğrula\n"
 "                   (--no-verify-rpm bunu iptal eder, öntanımlı etkindir).\n"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - virgül ile ayrılmış yolları dahil etme.\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr ""
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - komut satırındakilere uyanların tümünü seçer. \n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - paketi bulmak için aramaya izin ver.\n"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 "  -P           - sağlanan paketlerin arasında paketi bulmak için arama "
 "yapma.\n"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - hatalı aramayı uygulamaya koy ( --fuzzy ile aynı)\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 "  -s             - bir sonraki paket bir kaynak paketi(--src ile aynı).\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - Sessiz kipi.\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 "  komut satırından isimleri veya rpm dosyaları verilenler yüklenecek.\n"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr ""
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "komut satırından kötü vekil sunucu bildirimi\n"
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: \"-%s\" seçeneği bilinmiyor, ayrıntılı bilgi için --help\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 "--install-src özelliği binary rpm dosyaları kullanılırken neyi halleder"
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1433,22 +1372,22 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "Birşey yapma"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr ""
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr ""
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1458,66 +1397,66 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, fuzzy, c-format
 msgid "Install it"
 msgstr "Kurulum başarısız oldu"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr ""
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "%s dizini hata raporu için oluşturulamıyor"
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Paketleri kurmak için sadece sistem yöneticisi yetkilidir"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "%s kurulumu için aşağıdaki paketlerin biri gerekli:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Aşağıdaki paketlerden birine ihtiyaç var:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Seçiminiz? (1-%d) "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "Paket kurulumu..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "Hazırlanıyor..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr "kabul ediyor musunuz ?"
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1528,7 +1467,7 @@ msgstr ""
 "için aşağıdaki paketlerin kaldırılması gerekiyor:\n"
 "%s\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1538,16 +1477,16 @@ msgstr ""
 "gerekiyor:\n"
 "%s"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
 "Bağımlılık sorununu aşabilmek için, aşağıdaki paketlerin de kurulması "
 "gerekiyor (%d Mb)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1556,37 +1495,47 @@ msgstr ""
 "Aşağıdaki bağımlılıkların yüklenebilmesi için root olmalısınız:\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "kaynak paketleri alınamadı, çıkılıyor"
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Lütfen \"%s\" isimli ortamı [%s] aygıtına yerleştirin"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Hazır olduğunuzda Enter'a basın..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "'%s' paketi indiriliyor..."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%%'nin %s'i tamamlandı, Kalan Süre = %s, Hız = %s"
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% tamamlandı, hız = %s"
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Sonraki paketler hatalı imza içeriyor"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Yüklemeye devam etmek istiyor musunuz ?"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1597,57 +1546,57 @@ msgstr ""
 "%s\n"
 "Urpmi veritabanınızı güncellemek isteyebilirsiniz"
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "Kurulum başarısız oldu"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr "%s dağıtılıyor"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr "%s kuruluyor"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "'%s' paketi kuruluyor ( %s/%s )..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Paket bağımlılıklarını denetlemeksizin kurulum denensin mi (e/H) "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Belki daha zorlayıcı bir seçenek gerekebilir (--force)? (e/H) "
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr ""
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "Kurulum Başarılı"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "herşey zaten kurulu"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr ""
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1672,29 +1621,29 @@ msgstr ""
 "\n"
 "ve [seçenekler] de şunlardan biridir:\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - güncelleme ortamı oluştur.\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
 "                   hdlist file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -1703,7 +1652,7 @@ msgstr ""
 "  --distrib      - tüm medyaları otomatik olarak bir kurulum medyasından\n"
 "                   oluştur.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1714,7 +1663,7 @@ msgstr ""
 "                   XXX değeri main, contrib, updates yada\n"
 "                   atanmış herhangi başka bir değer alabilir ;-)\n"
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1723,7 +1672,7 @@ msgstr ""
 "  --from         - yansı adreslerini almak için belirtilen adresi kullan,\n"
 "                   öntanımlı adres: %s\n"
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1734,7 +1683,7 @@ msgstr ""
 "                   kurulu bulunan mandrake sürüm paketi tarafından\n"
 "                   belirtilen sürümdür.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
@@ -1743,79 +1692,60 @@ msgstr ""
 "  --arch         - belirtilen mimariyi kullan, öntanımlı olan \n"
 "                   kurulmuş mandrake-sürüm paketi.\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 "  -c             - 'başlıklar arabelleği'nin bulunduğu dizini temizle.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f              - hdlist dosyalarını oluşum için zorla.\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"bilinmeyen seçenek '%s'\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "cooker dağıtımı güncellemeleri eklenemiyor\n"
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "\"%s\" adresinden yansılar getiriliyor..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"<hdlist'in göreceli konumu> --distrib ile gerekli değil "
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "<hdlist'in göreceli konumu> --distrib ile gerekli değil "
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "\"%s\" güncellenemiyor\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"<hdlist'in göreli dosyaismi> eksik\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<hdlist'in göreli dosyaismi> eksik\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
+msgid "`with' missing for network media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "\"%s\" oluşturulamıyor\n"
@@ -1834,6 +1764,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - tüm ortamları seçer.\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"bilinmeyen seçenek '%s'\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1850,7 +1789,7 @@ msgstr ""
 "Silme için girdi eksik\n"
 "(bunlardan biri %s)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1859,29 +1798,29 @@ msgstr ""
 "kullanımı: urpmi.update [seçenekler] <isim> ...\n"
 "  <isim>      güncellenecek medyanın ismidir.\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - sadece güncelleme medyasını güncelle.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr ""
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - tüm kaldırılamaz medyaları seçer.\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "Güncellenecek hiç birşey yok\n"
 "(yeni ortam eklemek için \"urpmi.addmedia\" kullanın)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1890,7 +1829,7 @@ msgstr ""
 "Güncelleme için girdi eksik\n"
 "(bunlardan biri %s)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1906,39 +1845,39 @@ msgstr ""
 "\n"
 "Kullanımı:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list           - tüm paketleri göster\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - mevcut medyaları göster\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr ""
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 "  --list-nodes   - --parallel kullanırken erişilebilir düğümleri listele.\n"
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases   - mevcut parelel alias'lari listele.\n"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
@@ -1948,7 +1887,7 @@ msgstr ""
 "                   standart çıktıya(monitör) aç(yönlendir)(sadece root "
 "için)\n"
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
@@ -1956,81 +1895,128 @@ msgstr ""
 "  --sources      - İndirmeye başlamadan önce tüm kaynak paketleri yolla.\n"
 "                   (Sadece root için geçerlidir).\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr ""
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - paket bağımlılıkları için sorguyu genişlet.\n"
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr "  -u             - daha güncel bir sürümü yüklü ise paketi kaldır.\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - kaldırılacak paketlerin toplu çıktısı.\n"
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - gerekli paketler için ters arama.\n"
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - isminin yanında grupları da yazar.\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - isminin yanıda sürüm numarasını da yazar.\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr ""
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 "  komut satırından isimleri veya rpm dosyaları verilenler sorgulandı.\n"
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: \"-%s\" seçeneği bilinmiyor, ayrıntılı bilgi için --help\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: \"%s\" rpm dosyası okunamıyor\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes sadece --parallel ile kullanılabilir"
 
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "Bilinmeyen webfetch `%s' !!!\n"
+
+#~ msgid "copy failed: %s"
+#~ msgstr "kopyalama başarısız: %s"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "wget kayıp\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "wget başarısız: %d ile veya %d sinyali ile çıkıldı.\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "curl kayıp\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "curl başarısız: %d ile veya %d sinyali ile çıkıldı\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "rsysnc kayıp\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "rsync başarısız: %d ile veya %d sinyali ile çıkıldı\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "ssh kayıp\n"
+
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpme: \"-%s\" seçeneği bilinmiyor, ayrıntılı bilgi için --help\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmi: \"-%s\" seçeneği bilinmiyor, ayrıntılı bilgi için --help\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr ""
+#~ "Bağımlılık sorununu aşabilmek için, aşağıdaki paketlerin de kurulması "
+#~ "gerekiyor (%d Mb)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "<hdlist'in göreceli konumu> --distrib ile gerekli değil "
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "<hdlist'in göreli dosyaismi> eksik\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmq: \"-%s\" seçeneği bilinmiyor, ayrıntılı bilgi için --help\n"
+
 #~ msgid "no webfetch (curl or wget currently) found\n"
 #~ msgstr "webfetch (curl veya wget ) bulunamadı\n"
 
diff --git a/po/uk.po b/po/uk.po
index 548690d4..d7c50c40 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-uk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2004-03-11 19:02+0200\n"
 "Last-Translator: Taras Boychuk <btr1@torba.com>\n"
 "Language-Team: ukrainian <uk@li.org>\n"
@@ -50,22 +50,22 @@ msgstr ""
 "Автоматичне встановлення пакунків...\n"
 "Ви замовили встановлення пакунка %s\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "Вірно?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "Гаразд"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Скасувати"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) (Т/н) "
@@ -75,7 +75,7 @@ msgstr " (Y/n) (Т/н) "
 msgid "%s: command not found\n"
 msgstr "%s: команди не знайдено\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
@@ -84,117 +84,56 @@ msgstr ""
 "використання: %s [параметри]\n"
 "де [параметри] - з\n"
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - виводити цю довідку.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "   -g [group]     - обмежити результати для вибраної групи.\n"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, c-format
 msgid "                    defaults is %s.\n"
 msgstr "                    типово %s.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Невідомий webfetch `%s' !!!\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "для %s вказано невідомий протокол"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "не знайдено webfetch, підтримуються такі webfetch: %s\n"
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "неможливо обробити протокол: %s"
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "копіювання завершено невдало: %s"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "немає wget\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget дав збій: завершено з %d або сигналом %d\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "немає curl\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl дав збій: завершено з %d або сигналом %d\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "немає rsync\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "rsync дав збій: завершено з %d або сигналом %d\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "немає ssh\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        завершено %s%% з %s, ETA = %s, швидкість = %s"
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        завершено %s%%, швидкість = %s"
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...відновлення невдале: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "синтаксична помилка в конфігураційному файлі в рядку %s"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 "носій \"%s\" намагається використати hdlist, що вже використовується, носія "
 "проігноровано"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 "носій \"%s\" намагається використати список, що вже використовується, носія "
 "проігноровано"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -203,40 +142,40 @@ msgstr ""
 "неможливо переглянути носія \"%s\", оскільки файл списку вже "
 "використовується іншим носієм"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 "неможливо використати назву \"%s\" для неназваного носія, бо вона вже "
 "використовується"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 "неможливо взяти носія \"%s\" в облік, оскільки файла списку [%s] не існує"
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "неможливо визначити носія цього hdlist файла [%s]"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "неможливо доступитися до файла hdlist \"%s\", носія проігноровано"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "неможливо доступитися до файла списку \"%s\", носія проігноровано"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "спроба обійти існуючого носія \"%s\", обхід"
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -245,94 +184,94 @@ msgstr ""
 "віртуальний носій \"%s\" не повинен мати заданих файлів hdlist або list,"
 "носія проігноровано"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr ""
 "віртуальний носій \"%s\" повинен мати повне посилання (url), носія "
 "проігноровано"
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "неможливо знайти файл hdlist для \"%s\", носія проігноровано"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "неможливо знайти файл списку для \"%s\", носія проігноровано"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "незв'язний файл списку для \"%s\", носія проігноровано"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "неможливо перевірити файл списку для \"%s\", носія проігноровано"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "забагато точок монтування для змінного носія \"%s\""
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "отримується змінний пристрій як \"%s\""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "використовується інший змінний пристрій [%s] для \"%s\""
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "неможливо відновити шлях до змінного носія \"%s\""
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "неможливо записати конфігураційний файл [%s]"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "записати конфігураційний файл [%s]"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "Неможливо використовувати паралельний режим з режимом use-distrib"
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "неможливо проаналізувати \"%s\" у файлі [%s]"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "перевіряється паралельний обробник у файлі [%s]"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "знайдено паралельний обробник для вузлів: %s"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "використовуються зв'язані носії для паралельного режиму: %s"
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "неможливо використати паралельну опцію \"%s\""
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -341,90 +280,90 @@ msgstr ""
 "--synthesis не може використовуватися з --media, --excludemedia, --"
 "sortmedia, --update або --parallel"
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "перевіряється файл synthesis [%s]"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "перевіряється файл hdlist [%s]"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "віртуальний носій \"%s\" не є локальним, носія проігноровано"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "проблема читання файла hdlist або synthesis для носія \"%s\""
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "здійснюється другий прохід обрахунку залежностей\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "пропускається пакунок %s"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "буде встановлено замість поновлення пакунка %s"
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "неможливо відкрити rpmdb"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "носій \"%s\" вже існує"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr "віртуальний носій повинен бути локальним"
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "додано носія %s"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "немає доступу до першого носія встановлення"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "копіюється файл hdlists..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "...копіювання невдале"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "...копіювання завершено"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
@@ -433,43 +372,49 @@ msgstr ""
 "немає доступу до першого носія встановлення (немає файла Mandrake/base/"
 "hdlists)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "відновлюється файл hdlists..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "...відновлення завершено"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...відновлення невдале: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "неправильний опис hdlist \"%s\" у файлі hdlists"
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "спроба вибрати неіснуючого носія \"%s\""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "вибір багатьох носіїв: %s"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "видаляється носій \"%s\""
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -479,7 +424,7 @@ msgstr ""
 "неможливо отримати доступ до носія \"%s\",\n"
 "це може статися, якщо Ви змонтували теку вручну під час створення носія."
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -488,225 +433,225 @@ msgstr ""
 "віртуальний носій \"%s\" повинен мати правильне джерело hdlist або "
 "synthesis, носія проігноровано"
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "копіюється файл опису \"%s\"..."
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "розраховується md5sum для існуючого джерела hdlist (або synthesis)"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "перевіряється файл MD5SUM"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "копіюється джерело hdlist (або synthesis) \"%s\"..."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "копіювання [%s] завершилось невдало (файл є підозріло малим)"
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr ""
 "розраховується md5sum для hdlist (або synthesis) для джерела, з якого йде "
 "копіювання"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "копіювання [%s] невдале (не співпадає md5sum)"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "проблема читання файла synthesis для носія \"%s\""
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "читаються rpm-файли з [%s]"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "неможливо прочитати rpm-файли для [%s]: %s"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "не знайдено rpm-файла для [%s]"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "відновлюється джерело hdlist (або synthesis) \"%s\"..."
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "знайдено випробуваний hdlist (або synthesis) як %s"
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr ""
 "розраховується md5sum для hdlist (або synthesis) джерела, що поновлюється"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr "неправильна md5sum"
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "поновлення джерела hdlist (або synthesis) невдале"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "немає файла hdlist для носія \"%s\""
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "файл [%s] вже використовується в тому ж носії \"%s\""
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "неможливо проаналізувати файл hdlist для \"%s\""
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "неможливо створити файл списку для \"%s\""
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "записується файл списку для носія \"%s\""
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "нічого не записано у файл списку для \"%s\""
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "перевіряється файл ключів з \"%s\"..."
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...імпортовано ключ %s з файла ключів \"%s\""
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "неможливо імпортувати файл ключів з \"%s\""
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "читаються заголовки з носія \"%s\""
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "створюється hdlist [%s]"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "побудовано hdlist synthesis файл для носія \"%s\""
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "знайдено %d заголовків у кеші"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "видаляються %d застарілі заголовки у кеші"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "монтується %s"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "розмонтовується %s"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "перенесено %s елементів в depslist"
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "не перенесено жодного елемента в depslist"
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "неправильна назва rpm-файла [%s]"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "відновлення rpm-файла [%s] ..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "немає доступу до rpm-файла [%s]"
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "неможливо зареєструвати rpm-файл"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "помилка реєстрації пакунків"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "немає пакунку з назвою %s"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Наступні пакунки містять %s: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "існує декілька пакунків з однаковою назвою rpm-файла \"%s\""
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "неможливо коректно проаналізувати [%s] на значенні \"%s\""
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -715,62 +660,62 @@ msgstr ""
 "носій \"%s\" використовує неправильний файл списку: \n"
 "  можливо, дзеркало не діє, спроба використати альтернативний метод"
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "носій \"%s\" не вказує на яке-небудь розташування файлів rpm"
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "пакунку %s не знайдено."
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "базу даних urpmi блоковано "
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "носія \"%s\" не вибрано"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "неможливо прочитати rpm-файл [%s] з носія \"%s\""
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "невідомого носія \"%s\" позначено як змінного, але він не є таким"
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "немає доступу до носія \"%s\""
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "неправильно сформований ввід: [%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "відновлення rpm-файлів з носія \"%s\"..."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "Підготовка..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "процес %d використовується для виконання транзакції"
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -778,82 +723,97 @@ msgstr ""
 "створено транзакцію для встановлення на %s (вилучити=%d, встановити=%d, "
 "поновити=%d)"
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr "неможливо створити транзакцію"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "вилучається пакунок %s"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "неможливо видалити пакунок %s"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "додається пакунок %s (id=%d, eid=%d, update=%d, file=%s)"
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "неможливо встановити пакунок %s"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "через відсутність %s"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "через незадоволеність %s"
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr "намагаюсь активізувати %s"
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr "для того, щоб встановити %s"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "для того, щоб встановити %s"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "через конфлікти з %s"
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr "не замовлено"
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Неправильний підпис (%s)"
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "Неправильний ідентифікатор ключа (%s)"
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Відсутній підпис (%s)"
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "невірне оголошення проксі в командному рядку\n"
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: неможливо прочитати rpm-файл \"%s\"\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Вибачте, невірний вибір, спробуйте ще раз\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -869,24 +829,24 @@ msgstr ""
 "\n"
 "використання:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - виводити цю довідку.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - автоматично вибирати пакунок із запропонованих.\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr "  --test         - перевірити, чи дане встановлення можливе.\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
@@ -894,17 +854,17 @@ msgstr ""
 "  --force        - примусово виконати, навіть якщо деяких пакунків не "
 "існує.\n"
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - розподілений urpmi поміж машин псевдоніма.\n"
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - використовувати інший root для встановлення rpm.\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -914,72 +874,62 @@ msgstr ""
 "використовується\n"
 "                   для встановлення (вилучення) chroot з параметром --root.\n"
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - детальний режим.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - вибрати всі пакунки відповідно до розширення.\n"
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: невідомий параметр \"-%s\", для довідки використайте --help\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr "невідомі пакунки"
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "невідомий пакунок"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "вилучення пакунка %s пошкодить вашу систему"
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr "Нічого вилучати"
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "Перевіряється можливість вилучення наступних пакунків"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr "Щоб задовольнити залежності, наступні пакунки буде вилучено (%d МБ)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (Т/н) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "вилучається %s"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr "Видалення невдале"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Вибачте, невірний вибір, спробуйте ще раз\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -995,24 +945,24 @@ msgstr ""
 "\n"
 "використання:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - використовування тільки носії з поновленнями.\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 "  --media        - використовувати тільки задані носії, відокремлені комою.\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 "  --excludemedia - не використовувати вказані джерела, розділені комами.\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1020,18 +970,18 @@ msgstr ""
 "  --sortmedia    - сортувати джерела відповідно до підписів, відділених "
 "комами.\n"
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - використовувати файл synthesis замість бази даних urpmi.\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - детальний режим.\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1042,87 +992,87 @@ msgstr ""
 ".................задано в командному рядку, несумісне з діалоговим "
 "режимом).\n"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --uniq         - не виводити однакові лінії.\n"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all          - виводити всі параметри.\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group        - виводити параметр group: група.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size         - виводити параметр size: розмір.\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --epoch        - виводити параметр epoch: період.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary      - виводити параметр summary: короткий звіт.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description  - виводити параметр description: опис.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr "  --sourcerpm    - виводити параметр sourcerpm: джерельний rpm.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr "  --packager     - виводити параметр packager: пакувальник.\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr "  --buildhost    - виводити параметр buildhost: основний host.\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --url          - виводити параметр url: адреса.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr "  --provides     - виводити параметр provides: всі використання.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr "  --requires     - виводити параметр requires: всі вимоги.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files        - виводити параметр files: всі файли.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr "  --conflicts    - виводити параметр conflicts: всі конфлікти.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr "  --obsoletes    - виводити параметр obsoletes: всі застарілі файли.\n"
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
@@ -1131,22 +1081,22 @@ msgstr ""
 "  --env          - використовувати специфічне оточення (звичайно звіт про "
 "помилку).\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr "  -i             - нехтувати регістрами в усіх шаблонах.\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - вивести версію, випуск і архів з назвою.\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - включати код perl безпосередньо як perl -e.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
@@ -1154,7 +1104,7 @@ msgstr ""
 "  -a             - двійковий оператор AND, повертає істина, якщо обидва "
 "вирази правдиві.\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
@@ -1162,24 +1112,24 @@ msgstr ""
 "  -o             - двійковий оператор OR, повертає істина (true), якщо вираз "
 "правдивий.\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 "  !              - унарний NOT, повертає істина (true), якщо вираз "
 "неправдивий.\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr "  (              - ліва дужка, щоб відкрити груповий вираз.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr "  )              - права дужка, щоб закрити груповий вираз.\n"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
@@ -1188,12 +1138,12 @@ msgstr ""
 "зворотній виклик:\n"
 "%s\n"
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "використовується особливе оточення на %s\n"
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1209,21 +1159,21 @@ msgstr ""
 "\n"
 "використання:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - використовувати вказаний файл synthesis замість бази "
 "даних urpmi.\n"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 "  --auto-select - автоматично вибрати пакунки для поновлення системи.\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
@@ -1232,7 +1182,7 @@ msgstr ""
 "  --no-uninstall - ніколи не запитувати про вилучення пакунка, припиняти "
 "встановлення.\n"
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1242,7 +1192,7 @@ msgstr ""
 "замовлені\n"
 "                   пакунки, які мають вилучатися.\n"
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1253,41 +1203,41 @@ msgstr ""
 "                   або поновлюватися більше, ніж задані пакунки,\n"
 "                   типове значення %d.\n"
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-level  - транзакції малої довжини, типова довжина %d.\n"
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - встановити нечіткий пошук (те саме, що -y).\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 "  --src          - наступний пакунок - це пакунок з вихідними текстами (так "
 "само, як -s).\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 "  --install-src  - встановити тільки пакунок з вихідними текстами (без "
 "двійкових файлів).\n"
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - спочатку видалити rpm з кешу.\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - зберігати невикористані rpm у кеші.\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1296,7 +1246,7 @@ msgstr ""
 "  --allow-nodeps - дозволити користувачеві встановлювати пакунки без "
 "перевірки залежностей.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1305,7 +1255,7 @@ msgstr ""
 "  --allow-force   - дозволити користувачеві встановлювати пакунки без "
 "перевірки залежностей і цілісності.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1315,24 +1265,24 @@ msgstr ""
 "використовується\n"
 "                   для встановлення chroot з параметром --root.\n"
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 "  --wget         - використовувати wget для доступу до віддалених файлів.\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 "  --curl         - використовувати curl для доступу до віддалених файлів.\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate    - обмежити швидкість завантаження.\n"
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1341,7 +1291,7 @@ msgstr ""
 "  --resume       - відновити переміщення частково звантажених файлів\n"
 "                   (--no-resume вимикає його, типово вимкнено).\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1350,7 +1300,7 @@ msgstr ""
 "  --proxy        - використовувати вказаний HTTP проксі, типово порт 1080 "
 "(формат - <proxyhost[:port]>).\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1359,7 +1309,7 @@ msgstr ""
 "  --proxy-user    - задати користувача і пароль, щоб використовувати\n"
 "для ідентифікації через проксі (формат - <user:password>).\n"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1368,12 +1318,12 @@ msgstr ""
 "  --bug          - вивести звіт про помилку в теку, вказану наступним "
 "аргументом.\n"
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - використовувати X інтерфейс.\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1382,7 +1332,7 @@ msgstr ""
 "  --best-output  - вибрати найкращий інтерфейс відповідно до оточення:\n"
 "                   X або текстовий режим.\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1392,76 +1342,65 @@ msgstr ""
 "                   (--no-verify-rpm вимикає це і встановлює типове "
 "значення).\n"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - виключити шлях, відокремлений комою.\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - не включати файли документації.\n"
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - вибрати всі відповідності в командному рядку.\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - дозволити пошук в provides, щоб знайти пакунок.\n"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - не шукати в provides, щоб знайти пакет.\n"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - задати невизначений пошук (так само як --fuzzy).\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 "  -s             - наступний пакунок є пакунком з джерельними текстами (те "
 "саме, що --src).\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - режим мовчання.\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  назви або rpm-файли, задані в командному рядку, буде встановлено.\n"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr "Виберіть місце для збереження файла"
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "невірне оголошення проксі в командному рядку\n"
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: невідомий параметр \"-%s\", перевірте використання з --help\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 "Що може бути зроблено з двійковими файлами rpm при використанні --install-src"
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1482,22 +1421,22 @@ msgstr ""
 "\n"
 "Що Ви хочете зробити?"
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "Не робити нічого"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr "Так, встановити його"
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr "Зберегти файл"
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1512,12 +1451,12 @@ msgstr ""
 "\n"
 "Можливо, Ви хочете просто зберегти його. Який Ваш вибір?"
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, c-format
 msgid "Install it"
 msgstr "Встановити його"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1526,42 +1465,42 @@ msgstr ""
 "Тека [%s] вже існує, використайте іншу теку на звіт про помилку або знищіть "
 "його"
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Неможливо створити теку [%s] для звіту про помилку"
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Тільки користувачу root дозволяється встановлювати пакунки"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "Один з наступних пакунків потрібен для встановлення %s:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Потрібен один із наступних пакунків:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Ваш вибір? (1-%d) "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "Встановлюється пакунок..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "Ініціалізується..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1570,12 +1509,12 @@ msgstr ""
 "Деякі із замовлених пакунків неможливо встановити:\n"
 "%s"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr "Ви впевнені?"
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1586,7 +1525,7 @@ msgstr ""
 "бути вилучені для того, щоб поновити інші:\n"
 "%s\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1595,16 +1534,16 @@ msgstr ""
 "Наступні пакунки будуть вилучені для того, щоб поновити інші:\n"
 "%s"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
 "Наступні пакунки буде встановлено для того, щоб задовольнити залежності (%d "
 "МБ)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1613,37 +1552,47 @@ msgstr ""
 "Вам необхідно мати права root, щоб встановити наступні залежності:\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "неможливо одержати початкові пакунки, завершується"
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Вставте, будь-ласка, носія %s у пристрій %s"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Натисніть Enter, коли будете готові..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Звантажується пакунок %s"
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        завершено %s%% з %s, ETA = %s, швидкість = %s"
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        завершено %s%%, швидкість = %s"
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Наступні пакунки мають неправильні підписи"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Ви хочете продовжувати інсталяцію?"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1654,57 +1603,57 @@ msgstr ""
 "%s\n"
 "Можливо, Вам потрібно поновити вашу базу даних urpmi"
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "Встановлення неуспішне"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr "встановлюється %s"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr "встановлюється %s"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Встановлюється пакунок `%s' (%s/%s)..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Спробувати інсталяцію без перевірки залежностей? (y/N) (т/Н) "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Спробувати примусове встановлення (--force)? (y/N) (т/Н) "
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d запит на встановлення завершився неуспішно"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "Встановлення можливе"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "Все вже встановлено"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr "перезапуск urpmi"
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1728,23 +1677,23 @@ msgstr ""
 "\n"
 "і [параметри] є з\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - створити носія поновлення.\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
 "  --probe-synthesis - намагатися знайти і використати файл synthesis.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr "  --probe-hdlist - намагатися знайти і використати файл hdlist.\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
@@ -1753,7 +1702,7 @@ msgstr ""
 "  --no-probe     - не намагатися знайти файли synthesis або\n"
 "                   hdlist.\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -1761,7 +1710,7 @@ msgid ""
 msgstr ""
 "  --distrib      - автоматично створювати всі носії із носія встановлення.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1772,7 +1721,7 @@ msgstr ""
 "....................дистрибутиву, XXX може бути main, contrib, updates\n"
 "....................або будь-що інше вже сконфігуроване ;-)\n"
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1781,7 +1730,7 @@ msgstr ""
 "  --from         - використовувати url для списку дзеркал, типове значення\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1792,7 +1741,7 @@ msgstr ""
 "                   використовується версія дистрибутиву, повідомлена\n"
 "                   встановленим пакунком випуску mandrake.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
@@ -1802,7 +1751,7 @@ msgstr ""
 "                   використовується архітектура встановленого пакунка\n"
 "                   випуску mandrake.\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
@@ -1811,73 +1760,52 @@ msgstr ""
 "  --virtual      - створити віртуального носія з найновішими даними,\n"
 "                   дозволяється тільки протокол file:// protocol.\n"
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - вимкнути перевірку файлів на MD5SUM.\n"
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - очищувати теку заголовків кешу.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - змушувати генерувати hdlist файли.\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"невідомі параметри '%s'\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "неможливо додати поновлення дистрибутиву cooker\n"
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "поновлення дзеркал з %s ..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"немає потреби задавати <відносний шлях hdlist> з --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "немає потреби задавати <відносний шлях hdlist> з --distrib"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "неможливо поновити носія\"%s\"\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"<відносний шлях hdlist> відсутній\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<відносний шлях hdlist> відсутній\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"'with' відсутній для джерела з мережі\n"
+msgid "`with' missing for network media\n"
+msgstr "'with' відсутній для джерела з мережі\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "неможливо створити носія\"%s\"\n"
@@ -1896,6 +1824,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - вибрати всі носії.\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"невідомі параметри '%s'\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1910,7 +1847,7 @@ msgstr ""
 "об'єкта для вилучення немає\n"
 "(один з %s)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1919,27 +1856,27 @@ msgstr ""
 "використання: urpmi.update [параметри] <назва> ...\n"
 "де <назва> - це назва носія з поновленнями.\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - поновити тільки носія з поновленнями.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr "  --force-key    - виконати поновлення ключа gpg.\n"
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - вибрати всі незнімні носії.\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "нічого поновлювати (використовуйте urpmi.addmedia, щоб додати носія)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1948,7 +1885,7 @@ msgstr ""
 "об'єкта для поновлення немає\n"
 "(один з %s)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1964,41 +1901,41 @@ msgstr ""
 "\n"
 "використання:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - вивести список доступних пакунків.\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media - вивести список доступних носіїв.\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - вивести наявні носії і їхні адреси.\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 "  --dump-config - вивести конфігурацію у формі аргументу urpmi.addmedia.\n"
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 "  --list-nodes     - вивести список доступних вузлів при використанні --"
 "parallel.\n"
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - вивести список доступних паралельних псевдонімів.\n"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
@@ -2007,7 +1944,7 @@ msgstr ""
 "  --headers      - вибрати заголовки для пакунків, перерахованих\n"
 "                          в базі даних urpmi, до stdout (root тільки).\n"
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
@@ -2015,7 +1952,7 @@ msgstr ""
 "  --sources      - вивести всі вихідні пакунки перед завантаженням (тільки "
 "root).\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
@@ -2024,17 +1961,17 @@ msgstr ""
 "  --use-distrib  - сконфігурувати urpmi на льоту з дерева дистрибутиву.\n"
 "                   Це дозволяє виконувати запити до дистрибутиву.\n"
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - друкувати changelog.\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - розширений запит до залежностей пакета.\n"
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -2042,58 +1979,115 @@ msgid ""
 msgstr ""
 "  -u             - пропустити пакунок, якщо новіша версія вже встановлена.\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - повний вивід даних про пакунок для вилучення.\n"
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - зворотний пошук пакунків.\n"
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 "  -i             - виводити корисну інформацію в придатному для читання "
 "вигляді.\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - також виводити групи з назвами.\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - також виводити версію і випуск з назвою.\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l         - вивести список файлів у пакунку.\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  назви або rpm-файли, задані в командному рядку, необхідні.\n"
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: невідомий параметр \"-%s\", перевірте використання з --help\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: неможливо прочитати rpm-файл \"%s\"\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes може використовуватися тільки з --parallel"
 
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "Невідомий webfetch `%s' !!!\n"
+
+#~ msgid "copy failed: %s"
+#~ msgstr "копіювання завершено невдало: %s"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "немає wget\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "wget дав збій: завершено з %d або сигналом %d\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "немає curl\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "curl дав збій: завершено з %d або сигналом %d\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "немає rsync\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "rsync дав збій: завершено з %d або сигналом %d\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "немає ssh\n"
+
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpme: невідомий параметр \"-%s\", для довідки використайте --help\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpmi: невідомий параметр \"-%s\", перевірте використання з --help\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr ""
+#~ "Наступні пакунки буде встановлено для того, щоб задовольнити залежності (%"
+#~ "d МБ)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "немає потреби задавати <відносний шлях hdlist> з --distrib"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "<відносний шлях hdlist> відсутній\n"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "'with' відсутній для джерела з мережі\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpmq: невідомий параметр \"-%s\", перевірте використання з --help\n"
+
 #~ msgid "no webfetch (curl or wget currently) found\n"
 #~ msgstr "не знайдено webfetch (curl або wget) \n"
 
diff --git a/po/urpmi.pot b/po/urpmi.pot
index 85060a54..625e2fbd 100644
--- a/po/urpmi.pot
+++ b/po/urpmi.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-16 11:23+0200\n"
+"POT-Creation-Date: 2004-04-24 00:36+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"
@@ -93,360 +93,305 @@ msgstr ""
 msgid "                    defaults is %s.\n"
 msgstr ""
 
-#: ../urpm.pm:96
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr ""
-
-#: ../urpm.pm:117
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr ""
 
-#: ../urpm.pm:139
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpm.pm:155
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr ""
 
-#: ../urpm.pm:176
-#, c-format
-msgid "copy failed: %s"
-msgstr ""
-
-#: ../urpm.pm:181
-#, c-format
-msgid "wget is missing\n"
-msgstr ""
-
-#: ../urpm.pm:227
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr ""
-
-#: ../urpm.pm:230
-#, c-format
-msgid "curl is missing\n"
-msgstr ""
-
-#: ../urpm.pm:329
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr ""
-
-#: ../urpm.pm:335 ../urpm.pm:382
-#, c-format
-msgid "rsync is missing\n"
-msgstr ""
-
-#: ../urpm.pm:379 ../urpm.pm:426
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr ""
-
-#: ../urpm.pm:383
-#, c-format
-msgid "ssh is missing\n"
-msgstr ""
-
-#: ../urpm.pm:436 ../urpmi:584
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr ""
-
-#: ../urpm.pm:438 ../urpmi:587
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr ""
-
-#: ../urpm.pm:445 ../urpm.pm:1043 ../urpm.pm:1702 ../urpm.pm:1711
-#: ../urpm.pm:2314 ../urpm.pm:2994 ../urpmi:595 ../urpmi.addmedia:136
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr ""
-
-#: ../urpm.pm:488 ../urpm.pm:501 ../urpm.pm:514
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr ""
 
-#: ../urpm.pm:525
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:531
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:547
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
 "medium"
 msgstr ""
 
-#: ../urpm.pm:553
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
-#: ../urpm.pm:560
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: ../urpm.pm:564
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr ""
 
-#: ../urpm.pm:573
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:575 ../urpm.pm:2683
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:599
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: ../urpm.pm:607
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
 "ignored"
 msgstr ""
 
-#: ../urpm.pm:612
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:621
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:628
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:651
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:659
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:692
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:693
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: ../urpm.pm:697
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr ""
 
-#: ../urpm.pm:702 ../urpm.pm:705
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:718
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr ""
 
-#: ../urpm.pm:740
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr ""
 
-#: ../urpm.pm:752
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 
-#: ../urpm.pm:762
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr ""
 
-#: ../urpm.pm:773
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr ""
 
-#: ../urpm.pm:783
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr ""
 
-#: ../urpm.pm:787
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr ""
 
-#: ../urpm.pm:791
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr ""
 
-#: ../urpm.pm:802
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
 "update or --parallel"
 msgstr ""
 
-#: ../urpm.pm:853 ../urpm.pm:875 ../urpm.pm:1227 ../urpm.pm:1238
-#: ../urpm.pm:1299 ../urpm.pm:1316 ../urpm.pm:1399 ../urpm.pm:1456
-#: ../urpm.pm:1628 ../urpm.pm:1728 ../urpm.pm:1826 ../urpm.pm:1832
-#: ../urpm.pm:1931 ../urpm.pm:2010 ../urpm.pm:2014
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr ""
 
-#: ../urpm.pm:857 ../urpm.pm:870 ../urpm.pm:879 ../urpm.pm:1230
-#: ../urpm.pm:1241 ../urpm.pm:1305 ../urpm.pm:1311 ../urpm.pm:1404
-#: ../urpm.pm:1460 ../urpm.pm:1632 ../urpm.pm:1732 ../urpm.pm:1820
-#: ../urpm.pm:1838 ../urpm.pm:2020
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr ""
 
-#: ../urpm.pm:865 ../urpm.pm:1234
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:888 ../urpm.pm:1248 ../urpm.pm:1324 ../urpm.pm:1408
-#: ../urpm.pm:1736
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:894 ../urpm.pm:1970
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr ""
 
-#: ../urpm.pm:906
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr ""
 
-#: ../urpm.pm:915
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr ""
 
-#: ../urpm.pm:926 ../urpm.pm:2483 ../urpm.pm:2544 ../urpm.pm:3119
-#: ../urpm.pm:3217
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr ""
 
-#: ../urpm.pm:965
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: ../urpm.pm:972
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr ""
 
-#: ../urpm.pm:1004
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr ""
 
-#: ../urpm.pm:1020
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr ""
 
-#: ../urpm.pm:1024
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr ""
 
-#: ../urpm.pm:1026 ../urpm.pm:1339 ../urpm.pm:1428
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr ""
 
-#: ../urpm.pm:1026 ../urpm.pm:1339 ../urpm.pm:1432
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr ""
 
-#: ../urpm.pm:1028 ../urpm.pm:1047 ../urpm.pm:1075
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
 "found)"
 msgstr ""
 
-#: ../urpm.pm:1034
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr ""
 
-#: ../urpm.pm:1041 ../urpm.pm:1718 ../urpm.pm:2311 ../urpm.pm:2992
-#: ../urpmi.addmedia:134
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr ""
 
-#: ../urpm.pm:1063
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr ""
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: ../urpm.pm:1108
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1110
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr ""
 
-#: ../urpm.pm:1110
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr ""
 
-#: ../urpm.pm:1126
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1275
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -454,377 +399,377 @@ msgid ""
 "medium."
 msgstr ""
 
-#: ../urpm.pm:1328
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
 "ignored"
 msgstr ""
 
-#: ../urpm.pm:1336
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1359 ../urpm.pm:1588
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr ""
 
-#: ../urpm.pm:1370 ../urpm.pm:1599
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr ""
 
-#: ../urpm.pm:1424
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
 
-#: ../urpm.pm:1441
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr ""
 
-#: ../urpm.pm:1443
+#: ../urpm.pm:1107
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr ""
 
-#: ../urpm.pm:1464 ../urpm.pm:1636 ../urpm.pm:1934
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1503
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr ""
 
-#: ../urpm.pm:1522
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr ""
 
-#: ../urpm.pm:1527
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr ""
 
-#: ../urpm.pm:1654
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1673
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr ""
 
-#: ../urpm.pm:1709
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr ""
 
-#: ../urpm.pm:1711
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr ""
 
-#: ../urpm.pm:1792
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: ../urpm.pm:1799
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1810 ../urpm.pm:1862
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1848
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1886
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1893
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1895
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1915
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1918
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1984
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1989
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr ""
 
-#: ../urpm.pm:2001 ../urpm.pm:2030 ../urpmi:343
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:2050
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr ""
 
-#: ../urpm.pm:2054
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: ../urpm.pm:2254
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr ""
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr ""
 
-#: ../urpm.pm:2289
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: ../urpm.pm:2290
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr ""
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr ""
 
-#: ../urpm.pm:2309
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr ""
 
-#: ../urpm.pm:2316 ../urpm.pm:3161
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: ../urpm.pm:2321
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr ""
 
-#: ../urpm.pm:2324
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr ""
 
-#: ../urpm.pm:2425
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr ""
 
-#: ../urpm.pm:2428 ../urpme:83
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr ""
 
-#: ../urpm.pm:2620 ../urpm.pm:2664 ../urpm.pm:2690
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: ../urpm.pm:2675
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr ""
 
-#: ../urpm.pm:2702
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
 "  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
 
-#: ../urpm.pm:2706
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr ""
 
-#: ../urpm.pm:2718
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr ""
 
-#: ../urpm.pm:2758 ../urpm.pm:2773 ../urpm.pm:2797 ../urpm.pm:2812
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr ""
 
-#: ../urpm.pm:2864 ../urpm.pm:2867 ../urpm.pm:2897
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr ""
 
-#: ../urpm.pm:2893
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:2901
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:2975
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr ""
 
-#: ../urpm.pm:2982
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:3059 ../urpmi:673
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr ""
 
-#: ../urpm.pm:3092
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr ""
 
-#: ../urpm.pm:3123
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
-#: ../urpm.pm:3126
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr ""
 
-#: ../urpm.pm:3134
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr ""
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr ""
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr ""
 
-#: ../urpm.pm:3149
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr ""
 
-#: ../urpm.pm:3348 ../urpm.pm:3379
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr ""
 
-#: ../urpm.pm:3349 ../urpm.pm:3377
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpm.pm:3350
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr ""
 
-#: ../urpm.pm:3351
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr ""
 
-#: ../urpm.pm:3372
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr ""
 
-#: ../urpm.pm:3384
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr ""
 
-#: ../urpm.pm:3386
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr ""
 
-#: ../urpm.pm:3402
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr ""
 
-#: ../urpm.pm:3429
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr ""
 
-#: ../urpm.pm:3431
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr ""
 
-#: ../urpm/args.pm:74 ../urpm/args.pm:80
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
 #, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr ""
 
-#: ../urpm/args.pm:208
+#: ../urpm/args.pm:216
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr ""
@@ -845,8 +790,8 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:46
-#: ../urpmi.removemedia:36 ../urpmi.update:29 ../urpmq:42
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr ""
@@ -862,13 +807,13 @@ msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 
-#: ../urpme:44 ../urpmi:97 ../urpmq:62
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: ../urpme:45 ../urpmi:102 ../urpmq:63
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
@@ -885,7 +830,7 @@ msgid ""
 "                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpme:49 ../urpmi:133 ../urpmq:75
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr ""
@@ -895,47 +840,47 @@ msgstr ""
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpme:78
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr ""
 
-#: ../urpme:78
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr ""
 
-#: ../urpme:88
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr ""
 
-#: ../urpme:90
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr ""
 
-#: ../urpme:94
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr ""
 
-#: ../urpme:101
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
 
-#: ../urpme:103 ../urpmi:460 ../urpmi:619
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr ""
 
-#: ../urpme:106 ../urpmi:662
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr ""
 
-#: ../urpme:110
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr ""
@@ -951,28 +896,28 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../urpmf:33 ../urpmi:78 ../urpmq:43
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: ../urpmf:34 ../urpmi:79 ../urpmq:44
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:35 ../urpmi:80 ../urpmq:45
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:36 ../urpmi:81 ../urpmq:46
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:37 ../urpmq:47
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
@@ -1070,7 +1015,7 @@ msgstr ""
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr ""
 
-#: ../urpmf:57 ../urpmi:117 ../urpmq:72
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
@@ -1082,7 +1027,7 @@ msgstr ""
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
 
-#: ../urpmf:60 ../urpmq:87
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
@@ -1126,7 +1071,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../urpmf:118 ../urpmi:240 ../urpmq:108
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr ""
@@ -1147,7 +1092,7 @@ msgstr ""
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmi:84 ../urpmq:48
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
@@ -1160,7 +1105,7 @@ msgid ""
 "installation.\n"
 msgstr ""
 
-#: ../urpmi:86 ../urpmq:50
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1180,12 +1125,12 @@ msgstr ""
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpmi:92 ../urpmq:49
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
 
-#: ../urpmi:93 ../urpmq:58
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
@@ -1226,17 +1171,17 @@ msgid ""
 "                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi:106 ../urpmi.addmedia:47 ../urpmi.update:30 ../urpmq:66
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi:107 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi:108 ../urpmi.addmedia:49 ../urpmi.update:32
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
@@ -1248,14 +1193,14 @@ msgid ""
 "                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
 
-#: ../urpmi:111 ../urpmi.addmedia:50 ../urpmi.update:33 ../urpmq:68
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 
-#: ../urpmi:113 ../urpmi.addmedia:52 ../urpmi.update:35 ../urpmq:70
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1298,7 +1243,7 @@ msgstr ""
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr ""
 
-#: ../urpmi:127 ../urpmq:78
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr ""
@@ -1308,17 +1253,17 @@ msgstr ""
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi:129 ../urpmq:80
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi:130 ../urpmq:82
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 
-#: ../urpmi:131 ../urpmq:83
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
@@ -1458,8 +1403,8 @@ msgstr ""
 #: ../urpmi:488 ../urpmi:497
 #, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
 
 #: ../urpmi:494
@@ -1469,7 +1414,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../urpmi:515 ../urpmq:281
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr ""
@@ -1489,6 +1434,16 @@ msgstr ""
 msgid "Downloading package `%s'..."
 msgstr ""
 
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr ""
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr ""
+
 #: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
@@ -1557,7 +1512,7 @@ msgstr ""
 msgid "restarting urpmi"
 msgstr ""
 
-#: ../urpmi.addmedia:37
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1572,36 +1527,36 @@ msgid ""
 "and [options] are from\n"
 msgstr ""
 
-#: ../urpmi.addmedia:54
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:55
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:56
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:57
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
 "                   hdlist file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:59
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1609,14 +1564,14 @@ msgid ""
 "                   anything else that has been configured ;-)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1624,66 +1579,66 @@ msgid ""
 "                   installed mandrake-release package.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
 "                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:73 ../urpmi.update:38
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:74 ../urpmi.removemedia:38 ../urpmi.update:41
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:75 ../urpmi.update:42
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpmi.addmedia:132
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr ""
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:172
 #, c-format
 msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr ""
 
-#: ../urpmi.addmedia:176 ../urpmi.addmedia:199
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr ""
 
-#: ../urpmi.addmedia:187
+#: ../urpmi.addmedia:190
 #, c-format
 msgid "<relative path of hdlist> missing\n"
 msgstr ""
 
-#: ../urpmi.addmedia:189
+#: ../urpmi.addmedia:192
 #, c-format
 msgid "`with' missing for network media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:197
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr ""
@@ -1719,41 +1674,41 @@ msgid ""
 "(one of %s)\n"
 msgstr ""
 
-#: ../urpmi.update:27
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
 msgstr ""
 
-#: ../urpmi.update:37
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr ""
 
-#: ../urpmi.update:39
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr ""
 
-#: ../urpmi.update:40
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: ../urpmi.update:62
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: ../urpmi.update:74
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
 "(one of %s)\n"
 msgstr ""
 
-#: ../urpmq:37
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1764,110 +1719,110 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../urpmq:52
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr ""
 
-#: ../urpmq:53
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr ""
 
-#: ../urpmq:54
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr ""
 
-#: ../urpmq:55
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
-#: ../urpmq:56
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 
-#: ../urpmq:57
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr ""
 
-#: ../urpmq:59
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: ../urpmq:61
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: ../urpmq:64
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmq:74
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr ""
 
-#: ../urpmq:76
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: ../urpmq:77
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr ""
 
-#: ../urpmq:79
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 
-#: ../urpmq:81
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 
-#: ../urpmq:84
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 
-#: ../urpmq:85
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr ""
 
-#: ../urpmq:86
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr ""
 
-#: ../urpmq:88
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr ""
 
-#: ../urpmq:89
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: ../urpmq:144
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr ""
diff --git a/po/uz.po b/po/uz.po
index f6fecbcb..ef412e50 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-uz\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2004-02-16 00:00+0100\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <uz-li@yahoogroups.com>\n"
@@ -48,22 +48,22 @@ msgstr ""
 "Пакетларни автоматик равишда ўрнатиш...\n"
 "Сиз ўрнатишни талаб қилдинган пакет: %s\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "Бўладими?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "Ок"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Бекор қилиш"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (Ҳ/й) "
@@ -73,249 +73,188 @@ msgstr " (Ҳ/й) "
 msgid "%s: command not found\n"
 msgstr "%s: буйруқ топилмади\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "where [options] are from\n"
 msgstr ""
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - шу ёрдам хабарини кўрсатиш.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, fuzzy, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "  --group        - group тэгини кўрсатиш: гуруҳ.\n"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, fuzzy, c-format
 msgid "                    defaults is %s.\n"
 msgstr "  -l             - пакетдаги файлларни кўрсатиш.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Номаълум webfetch \"%s\" !!!\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "%s учун номаълум протокол аниқланган"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr ""
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "нусха кўчириш муваффақиятсиз тугади: %s"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "wget дастури етишмаяпти\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr ""
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "curl дастури етишмаяпти\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr ""
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "rsync дастури етишмаяпти\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr ""
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "ssh дастури етишмаяпти\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% %s дан бажарилди, ЕТА = %s, тезлик = %s"
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% бажарилди, тезлик = %s"
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...олиш муваффақиятсиз тудаги: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "мослама файлининг %s чи сатрда хато"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
 "medium"
 msgstr ""
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "hdlist файлининг (%s) манбасини аниқлаб бўлмади"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
 "ignored"
 msgstr ""
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr ""
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "мослама файлини (%s) ёзиб бўлмади"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "мослама файли (%s) ёзилмоқда"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr ""
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr ""
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr ""
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr ""
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr ""
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -324,133 +263,139 @@ msgstr ""
 "--synthesis'дан --media, --excludemedia, --sortmedia, --update or --parallel "
 "билан бирга фойдаланиб бўлмайди"
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "synthesis файли (%s) текширилмоқда"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "hdlist файли (%s) текширилмоқда"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "манбанинг (%s) hdlist ёки synthesis файлини ўқишда муаммо юзага келди"
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "боғликларни аниқлаш учун иккинчи босқич бажарилмоқди\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "%s пакети ташлаб ўтилмоқда"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr ""
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "rpmdb'ни очиб бўлмади"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "манба (%s) аллақачон мавжуд"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr ""
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "%s манбаси қўшилди"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr ""
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "hdlists файлидан нусха кўчирилмоқда..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "...нусха кўчириш муваффақиятсиз тугади"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "...нусха кўчириш бажарилди"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
 "found)"
 msgstr ""
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "hdlists файли олинмоқда..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "...олиш тугади"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...олиш муваффақиятсиз тудаги: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr ""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "манба (%s) ўчирилмоқда"
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -458,373 +403,388 @@ msgid ""
 "medium."
 msgstr ""
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
 "ignored"
 msgstr ""
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "мавжуд бўлган hdlist (ёки synthesis) файли учун md5sum ҳисобланмоқда"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "MD5SUM файли текширилмоқда"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr ""
 "манбанинг олинган hdlist (ёки synthesis) файлинининг md5sum'и ҳисобланмоқда"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "%s'дан нусха кўчириш муваффақиятсиз тугади (md5sum нотўғри)"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "Манбанинг (%s) synthesis файлини ўқишда муаммо юзага келди"
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "RPM-файллари %s'дан ўқилмоқда"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "[%s]: %s'дан RPM-файлларни ўқиб бўлмади"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "%s'дан RPM-файллар топилмади"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr ""
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr ""
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr "md5sum мос келмади"
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "манбада (%s) ҳеч қандай hdlist файли топилмади"
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "манба (%s) учун рўйхат файли ёзилмоқда"
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "манбадан (%s) сарлавҳалар ўқилмоқда"
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "[%s] hdlist файли яратилмоқда"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "манба (%s) учун hdlist synthesis файли яратилди"
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "кэшда %d сарлавҳа топилди"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "Кэшдаги %d эски сарлавҳа ўчирилмоқда"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "%s уланмоқда"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "%s узилмоқда"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr ""
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "RPM-файлининг номи (%s) нотўғри"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "RPM-файли (%s) олинмоқда..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "RPM-файлини рўйхатдан ўтказиб бўлмади"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr ""
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "%s номли пакет мавжуд эмас"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Қуйидаги пакетларда %s бор: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "номи (%s) бир ҳил бўлган бир нечта RPM-файли мавжуд"
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr ""
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
 "  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "манба (%s) RPM-файлларнинг жойини аниқламаган"
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "%s пакети топилмади."
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi маълумот базаси қулфланган"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "манба (%s) танланмаган"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "RPM-файлини (%s) манбадан (%s) ўқиб бўлмади"
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr ""
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "RPM -файллари манбадан (%s) олинмоқда..."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "Таёрланмоқда..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr ""
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr ""
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "%s пакети олиб ташланмоқда"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "пакетни (%s) олиб ташлаб бўлмади"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "%s пакети қўшилмоқда (id=%d, eid=%d, янгилаш=%d, файл=%s)"
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "%s пакетини ўрнатиб бўлмади"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "%s етишмаганига кўра"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr ""
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr "%s'ни қолдириш учун"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "%s'ни ўрнатиш учун"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr ""
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr ""
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Имзо ҳақиқий эмас (%s)"
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr ""
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Имзо етишмайди (%s)"
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr ""
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: RPM-файлини (%s) ўқиб бўлмади\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Узр, нотўғри танлов. Бошқасини танланг\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -840,114 +800,102 @@ msgstr ""
 "\n"
 "Фойдаланиш:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - шу ёрдам хабарини кўрсатиш.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr "  --test         - ўрнатишни тўғри бажариш имкониятини текшириш.\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr ""
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - ортиқча хабарлар билан.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-"urpme: номаълум параметр \"-%s\", қандай фойдаланишни --help билан "
-"текширинг\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr "Номаълум пакетлар"
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "номаълум пакет"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "пакетни (%s) олиб ташлаш системангизни ишдан чиқаради"
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr "Ўчириш учун ҳеч нарса йўқ"
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "Қуйидаги пакетларни олиб ташлаш учун текшириш бажарилмоқда"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr "Боғлиқликларни таъминлаш учун қуйидаги пакетлар олиб ташланади (%d Мб)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (ҳ/Й) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "%s ўчирилмоқда"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr "Ўчириш муваффақиятсиз тугади"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Узр, нотўғри танлов. Бошқасини танланг\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -963,42 +911,42 @@ msgstr ""
 "\n"
 "Фойдаланиш:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - фақат янгилаш манбасидан фойдаланиш.\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 "  --media        - фақат кўрсатилган, вергул билан ажратилган, манбалардан "
 "фойдаланиш.\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 "  --excludemedia - кўрсатилган, вергул билан ажратилган, манбалардан "
 "фойдаланмаш.\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr "  --synthesis    - urpmi МБ ўрнига synthesis файлидан фойдаланиш.\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - ортиқча хабарлар билан.\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1006,148 +954,148 @@ msgid ""
 "                   line, incompatible with interactive mode).\n"
 msgstr ""
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --uniq         - бир ҳил қаторларни кўрсатмаш.\n"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all          - ҳамма тэгларни кўрсатиш.\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group        - group тэгини кўрсатиш: гуруҳ.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size         - size тэгини кўрсатиш: ҳажми.\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr ""
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary      - summary тэгини кўрсатиш: ҳисобот.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description  - description тэгини кўрсатиш: таърифи.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr ""
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr ""
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr ""
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --url          - url тэгини кўрсатиш: url.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr ""
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr ""
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files         - files тэгини кўрсатиш: ҳамма файллар.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr ""
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr ""
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
 msgstr ""
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
 "%s\n"
 msgstr ""
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1163,32 +1111,32 @@ msgstr ""
 "\n"
 "Фойдаланиш:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - urpmi МБ ўрнига synthesis файлидан фойдаланиш.\n"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - системани янгилаш учун пакетларни авто-танлаш.\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr ""
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that leads to remove.\n"
 msgstr ""
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1196,190 +1144,177 @@ msgid ""
 "                   default is %d.\n"
 msgstr ""
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - ишлатилмаган RPM'ни кэшда сақлаш.\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 "  --wget         - масофадаги файлларни олиш учун wget дастурини ишлатиш.\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 "  --curl         - масофадаги файлларни олиш учун curl дастурини ишлатиш.\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - пакетларни олиш тезлигини чеклаш.\n"
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
 msgstr ""
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
 msgstr ""
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - X интерфейсидан фойдаланиш.\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
 "                   X or text mode.\n"
 msgstr ""
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - қўлланма файлларсиз.\n"
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - хабарсиз.\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr ""
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr ""
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-"urpmi: номаълум параметр \"-%s\", қандай фойдаланишни --help билан "
-"текширинг\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1392,22 +1327,22 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "Ҳеч нарса қилмаш"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr ""
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr "Файлни сақлаш"
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1417,54 +1352,54 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, c-format
 msgid "Install it"
 msgstr "Ўрнатиш"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr ""
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr ""
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Фақат бошқарувчи пакетларни ўрнатиши мумкин"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "%s'ни ўрнатиш учун қуйидаги пакетлардан бири керак:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Қуйидаги пакетлардан бири керак:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Нимани танлайсиз? (1-%d) "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "Пакетни ўрнатиш..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "Ишга таёрланмоқда..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1473,12 +1408,12 @@ msgstr ""
 "Талаб қилинган баъзи бир пакетларни ўрнатиб бўлмайди:\n"
 "%s"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr "розимисиз ?"
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1489,7 +1424,7 @@ msgstr ""
 "учун қуйидаги пакетларни олиб ташлаш керак:\n"
 "%s\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1498,14 +1433,14 @@ msgstr ""
 "Бошқаларни янгилаш учун қуйидаги пакетларни олиб ташлаш керак:\n"
 "%s"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr "Боғлиқликларни таъминлаш учун қуйидаги пакетлар ҳам ўрнатилади (%d Мб)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1514,37 +1449,47 @@ msgstr ""
 "Қуйидаги боғлиқликларни ўрнатиш учун сиз root бўлишингиз керак:\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Илтимос \"%s\" номли манбани [%s] ускунасига қўйинг"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Таёр бўлганда ENTER тугмасини босинг..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "\"%s\" пакети олинмоқда..."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% %s дан бажарилди, ЕТА = %s, тезлик = %s"
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% бажарилди, тезлик = %s"
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Қуйидаги пакетларнинг имзолари нотўғри"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Ўрнатишни давом этишни истайсизми?"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1555,57 +1500,57 @@ msgstr ""
 "%s\n"
 "Балки urpmi маълумот базасини янгилашингиз керак."
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "Ўрнатиш муваффақиятсиз тугади"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr ""
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr "%s ўрнатилмоқда"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "\"%s\" (%s/%s) пакети ўрнатилмоқда..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Боғлиқликларни текширмасдан ўрнатиб кўрайми? (ҳ/Й) "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr ""
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr ""
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "Ўрнатиш мумкин"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "Ҳамма нарса аллақачон ўрнатилган"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr "urpmi қайтадан ишга тушмоқда"
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1620,40 +1565,40 @@ msgid ""
 "and [options] are from\n"
 msgstr ""
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - янгилаш манбасини яратиш.\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
 "  --probe-synthesis - synthesis файлини топишга ва ундан фойдаланишга уриниб "
 "кўриш.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr ""
 "  --probe-hdlist - hdlist файлини топишга ва ундан фойдаланишга уриниб "
 "кўриш.\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
 "                   hdlist file.\n"
 msgstr "  --no-probe     - synthesis ёки hdlist файлини топишга уринмаш.\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1661,14 +1606,14 @@ msgid ""
 "                   anything else that has been configured ;-)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr ""
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1676,81 +1621,66 @@ msgid ""
 "                   installed mandrake-release package.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
 "                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - сарлавҳаларнинг кэш директориясини тозалаш.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"номаълум параметрлар \"%s\"\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr ""
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr ""
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "манбани (%s) янгилаб бўлмади\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
+msgid "<relative path of hdlist> missing\n"
 msgstr ""
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
+msgid "`with' missing for network media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "манбани (%s) яратиб бўлмади\n"
@@ -1769,6 +1699,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - ҳамма манбаларни танлаш.\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"номаълум параметрлар \"%s\"\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1785,36 +1724,36 @@ msgstr ""
 "олиб ташлаш параметри етишмаяпти\n"
 "(қуйидагилардан биттаси: %s)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
 msgstr ""
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr ""
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr ""
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "янгилаш учун ҳеч нарса йўқ (манбани қўшиш учун\n"
 "urpmi.addmedia буйруғидан фойдаланинг)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1823,7 +1762,7 @@ msgstr ""
 "янгилаш параметри етишмаяпти\n"
 "(қуйидагилардан биттаси: %s)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1839,122 +1778,149 @@ msgstr ""
 "\n"
 "Фойдаланиш:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - мавжуд бўлган пакетлар рўйхатини кўрсатиш.\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - мавжуд бўлган манбалар рўйхатини кўрсатиш.\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - мавжуд бўлган манба ва унинг URL'ни кўрсатиш.\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr ""
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr ""
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr ""
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr ""
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr ""
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - пакетдаги файлларни кўрсатиш.\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-"urpmq: номаълум параметр \"-%s\", қандай фойдаланишни --help билан "
-"текширинг\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: RPM-файлини (%s) ўқиб бўлмади\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes'дан фақат --parallel билан бирга фойдаланиб бўлади"
+
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "Номаълум webfetch \"%s\" !!!\n"
+
+#~ msgid "copy failed: %s"
+#~ msgstr "нусха кўчириш муваффақиятсиз тугади: %s"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "wget дастури етишмаяпти\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "curl дастури етишмаяпти\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "rsync дастури етишмаяпти\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "ssh дастури етишмаяпти\n"
+
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpme: номаълум параметр \"-%s\", қандай фойдаланишни --help билан "
+#~ "текширинг\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpmi: номаълум параметр \"-%s\", қандай фойдаланишни --help билан "
+#~ "текширинг\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr ""
+#~ "Боғлиқликларни таъминлаш учун қуйидаги пакетлар ҳам ўрнатилади (%d Мб)"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpmq: номаълум параметр \"-%s\", қандай фойдаланишни --help билан "
+#~ "текширинг\n"
diff --git a/po/uz@Latn.po b/po/uz@Latn.po
index 806908b9..0086e15a 100644
--- a/po/uz@Latn.po
+++ b/po/uz@Latn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-uz\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2004-02-16 00:00+0100\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <uz-li@yahoogroups.com>\n"
@@ -48,22 +48,22 @@ msgstr ""
 "Paketlarni avtomatik ravishda o'rnatish...\n"
 "Siz o'rnatishni talab qildingan paket: %s\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "Bo'ladimi?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Bekor qilish"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (H/y) "
@@ -73,249 +73,188 @@ msgstr " (H/y) "
 msgid "%s: command not found\n"
 msgstr "%s: buyruq topilmadi\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "where [options] are from\n"
 msgstr ""
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - shu yordam xabarini ko'rsatish.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, fuzzy, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "  --group        - group tegini ko'rsatish: guruh.\n"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, fuzzy, c-format
 msgid "                    defaults is %s.\n"
 msgstr "  -l             - paketdagi fayllarni ko'rsatish.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Noma'lum webfetch \"%s\" !!!\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "%s uchun noma'lum protokol aniqlangan"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr ""
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "nusxa ko'chirish muvaffaqiyatsiz tugadi: %s"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "wget dasturi etishmayapti\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr ""
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "curl dasturi etishmayapti\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr ""
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "rsync dasturi etishmayapti\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr ""
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "ssh dasturi etishmayapti\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% %s dan bajarildi, ETA = %s, tezlik = %s"
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% bajarildi, tezlik = %s"
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...olish muvaffaqiyatsiz tudagi: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "moslama faylining %s chi satrda xato"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
 "medium"
 msgstr ""
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "hdlist faylining (%s) manbasini aniqlab bo'lmadi"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
 "ignored"
 msgstr ""
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr ""
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "moslama faylini (%s) yozib bo'lmadi"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "moslama fayli (%s) yozilmoqda"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr ""
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr ""
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr ""
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr ""
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr ""
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -324,134 +263,140 @@ msgstr ""
 "--synthesis'dan --media, --excludemedia, --sortmedia, --update or --parallel "
 "bilan birga foydalanib bo'lmaydi"
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "synthesis fayli (%s) tekshirilmoqda"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "hdlist fayli (%s) tekshirilmoqda"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr ""
 "manbaning (%s) hdlist yoki synthesis faylini o'qishda muammo yuzaga keldi"
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "bog'liklarni aniqlash uchun ikkinchi bosqich bajarilmoqdi\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "%s paketi tashlab o'tilmoqda"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr ""
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "rpmdb'ni ochib bo'lmadi"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "manba (%s) allaqachon mavjud"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr ""
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "%s manbasi qo'shildi"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr ""
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "hdlists faylidan nusxa ko'chirilmoqda..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "...nusxa ko'chirish muvaffaqiyatsiz tugadi"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "...nusxa ko'chirish bajarildi"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
 "found)"
 msgstr ""
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "hdlists fayli olinmoqda..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "...olish tugadi"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...olish muvaffaqiyatsiz tudagi: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr ""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "manba (%s) o'chirilmoqda"
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -459,374 +404,389 @@ msgid ""
 "medium."
 msgstr ""
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
 "ignored"
 msgstr ""
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr ""
 "mavjud bo'lgan hdlist (yoki synthesis) fayli uchun md5sum hisoblanmoqda"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "MD5SUM fayli tekshirilmoqda"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr ""
 "manbaning olingan hdlist (yoki synthesis) faylinining md5sum'i hisoblanmoqda"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "%s'dan nusxa ko'chirish muvaffaqiyatsiz tugadi (md5sum noto'g'ri)"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "Manbaning (%s) synthesis faylini o'qishda muammo yuzaga keldi"
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "RPM-fayllari %s'dan o'qilmoqda"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "[%s]: %s'dan RPM-fayllarni o'qib bo'lmadi"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "%s'dan RPM-fayllar topilmadi"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr ""
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr ""
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr "md5sum mos kelmadi"
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "manbada (%s) hech qanday hdlist fayli topilmadi"
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "manba (%s) uchun ro'yxat fayli yozilmoqda"
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "manbadan (%s) sarlavhalar o'qilmoqda"
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "[%s] hdlist fayli yaratilmoqda"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "manba (%s) uchun hdlist synthesis fayli yaratildi"
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "keshda %d sarlavha topildi"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "Keshdagi %d eski sarlavha o'chirilmoqda"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "%s ulanmoqda"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "%s uzilmoqda"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr ""
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "RPM-faylining nomi (%s) noto'g'ri"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "RPM-fayli (%s) olinmoqda..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "RPM-faylini ro'yxatdan o'tkazib bo'lmadi"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr ""
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "%s nomli paket mavjud emas"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Quyidagi paketlarda %s bor: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "nomi (%s) bir hil bo'lgan bir nechta RPM-fayli mavjud"
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr ""
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
 "  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "manba (%s) RPM-fayllarning joyini aniqlamagan"
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "%s paketi topilmadi."
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi ma'lumot bazasi qulflangan"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "manba (%s) tanlanmagan"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "RPM-faylini (%s) manbadan (%s) o'qib bo'lmadi"
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr ""
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "RPM -fayllari manbadan (%s) olinmoqda..."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "Tayorlanmoqda..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr ""
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr ""
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "%s paketi olib tashlanmoqda"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "paketni (%s) olib tashlab bo'lmadi"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "%s paketi qo'shilmoqda (id=%d, eid=%d, yangilash=%d, fayl=%s)"
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "%s paketini o'rnatib bo'lmadi"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "%s etishmaganiga ko'ra"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr ""
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr "%s'ni qoldirish uchun"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "%s'ni o'rnatish uchun"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr ""
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr ""
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Imzo haqiqiy emas (%s)"
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr ""
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Imzo etishmaydi (%s)"
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr ""
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: RPM-faylini (%s) o'qib bo'lmadi\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Uzr, noto'g'ri tanlov. Boshqasini tanlang\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -842,116 +802,104 @@ msgstr ""
 "\n"
 "Foydalanish:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - shu yordam xabarini ko'rsatish.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 "  --test         - o'rnatishni to'g'ri bajarish imkoniyatini tekshirish.\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr ""
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - ortiqcha xabarlar bilan.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-"urpme: noma'lum parametr \"-%s\", qanday foydalanishni --help bilan "
-"tekshiring\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr "Noma'lum paketlar"
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "noma'lum paket"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "paketni (%s) olib tashlash sistemangizni ishdan chiqaradi"
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr "O'chirish uchun hech narsa yo'q"
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "Quyidagi paketlarni olib tashlash uchun tekshirish bajarilmoqda"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
 "Bog'liqliklarni ta'minlash uchun quyidagi paketlar olib tashlanadi (%d Mb)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (h/Y) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "%s o'chirilmoqda"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr "O'chirish muvaffaqiyatsiz tugadi"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Uzr, noto'g'ri tanlov. Boshqasini tanlang\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -967,42 +915,42 @@ msgstr ""
 "\n"
 "Foydalanish:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - faqat yangilash manbasidan foydalanish.\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 "  --media        - faqat ko'rsatilgan, vergul bilan ajratilgan, manbalardan "
 "foydalanish.\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 "  --excludemedia - ko'rsatilgan, vergul bilan ajratilgan, manbalardan "
 "foydalanmash.\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr "  --synthesis    - urpmi MB o'rniga synthesis faylidan foydalanish.\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - ortiqcha xabarlar bilan.\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1010,148 +958,148 @@ msgid ""
 "                   line, incompatible with interactive mode).\n"
 msgstr ""
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --uniq         - bir hil qatorlarni ko'rsatmash.\n"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all          - hamma teglarni ko'rsatish.\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group        - group tegini ko'rsatish: guruh.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size         - size tegini ko'rsatish: hajmi.\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr ""
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary      - summary tegini ko'rsatish: hisobot.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description  - description tegini ko'rsatish: ta'rifi.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr ""
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr ""
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr ""
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --url          - url tegini ko'rsatish: url.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr ""
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr ""
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files         - files tegini ko'rsatish: hamma fayllar.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr ""
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr ""
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
 msgstr ""
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
 "%s\n"
 msgstr ""
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1167,33 +1115,33 @@ msgstr ""
 "\n"
 "Foydalanish:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - urpmi MB o'rniga synthesis faylidan foydalanish.\n"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 "  --auto-select  - sistemani yangilash uchun paketlarni avto-tanlash.\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr ""
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that leads to remove.\n"
 msgstr ""
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1201,192 +1149,179 @@ msgid ""
 "                   default is %d.\n"
 msgstr ""
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - ishlatilmagan RPM'ni keshda saqlash.\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 "  --wget         - masofadagi fayllarni olish uchun wget dasturini "
 "ishlatish.\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 "  --curl         - masofadagi fayllarni olish uchun curl dasturini "
 "ishlatish.\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - paketlarni olish tezligini cheklash.\n"
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
 msgstr ""
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
 msgstr ""
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - X interfeysidan foydalanish.\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
 "                   X or text mode.\n"
 msgstr ""
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - qo'llanma fayllarsiz.\n"
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - xabarsiz.\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr ""
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr ""
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-"urpmi: noma'lum parametr \"-%s\", qanday foydalanishni --help bilan "
-"tekshiring\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1399,22 +1334,22 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "Hech narsa qilmash"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr ""
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr "Faylni saqlash"
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1424,54 +1359,54 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, c-format
 msgid "Install it"
 msgstr "O'rnatish"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr ""
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr ""
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Faqat boshqaruvchi paketlarni o'rnatishi mumkin"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "%s'ni o'rnatish uchun quyidagi paketlardan biri kerak:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Quyidagi paketlardan biri kerak:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Nimani tanlaysiz? (1-%d) "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "Paketni o'rnatish..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "Ishga tayorlanmoqda..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1480,12 +1415,12 @@ msgstr ""
 "Talab qilingan ba'zi bir paketlarni o'rnatib bo'lmaydi:\n"
 "%s"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr "rozimisiz ?"
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1496,7 +1431,7 @@ msgstr ""
 "uchun quyidagi paketlarni olib tashlash kerak:\n"
 "%s\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1505,15 +1440,15 @@ msgstr ""
 "Boshqalarni yangilash uchun quyidagi paketlarni olib tashlash kerak:\n"
 "%s"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
 "Bog'liqliklarni ta'minlash uchun quyidagi paketlar ham o'rnatiladi (%d Mb)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1522,37 +1457,47 @@ msgstr ""
 "Quyidagi bog'liqliklarni o'rnatish uchun siz root bo'lishingiz kerak:\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Iltimos \"%s\" nomli manbani [%s] uskunasiga qo'ying"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Tayor bo'lganda ENTER tugmasini bosing..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "\"%s\" paketi olinmoqda..."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% %s dan bajarildi, ETA = %s, tezlik = %s"
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% bajarildi, tezlik = %s"
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Quyidagi paketlarning imzolari noto'g'ri"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "O'rnatishni davom etishni istaysizmi?"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1563,57 +1508,57 @@ msgstr ""
 "%s\n"
 "Balki urpmi ma'lumot bazasini yangilashingiz kerak."
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "O'rnatish muvaffaqiyatsiz tugadi"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr ""
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr "%s o'rnatilmoqda"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "\"%s\" (%s/%s) paketi o'rnatilmoqda..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Bog'liqliklarni tekshirmasdan o'rnatib ko'raymi? (h/Y) "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr ""
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr ""
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "O'rnatish mumkin"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "Hamma narsa allaqachon o'rnatilgan"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr "urpmi qaytadan ishga tushmoqda"
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1628,40 +1573,40 @@ msgid ""
 "and [options] are from\n"
 msgstr ""
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - yangilash manbasini yaratish.\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
 "  --probe-synthesis - synthesis faylini topishga va undan foydalanishga "
 "urinib ko'rish.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr ""
 "  --probe-hdlist - hdlist faylini topishga va undan foydalanishga urinib "
 "ko'rish.\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
 "                   hdlist file.\n"
 msgstr "  --no-probe     - synthesis yoki hdlist faylini topishga urinmash.\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1669,14 +1614,14 @@ msgid ""
 "                   anything else that has been configured ;-)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr ""
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1684,81 +1629,66 @@ msgid ""
 "                   installed mandrake-release package.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
 "                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - sarlavhalarning kesh direktoriyasini tozalash.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"noma'lum parametrlar \"%s\"\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr ""
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr ""
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "manbani (%s) yangilab bo'lmadi\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
+msgid "<relative path of hdlist> missing\n"
 msgstr ""
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
+msgid "`with' missing for network media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "manbani (%s) yaratib bo'lmadi\n"
@@ -1777,6 +1707,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - hamma manbalarni tanlash.\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"noma'lum parametrlar \"%s\"\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1793,36 +1732,36 @@ msgstr ""
 "olib tashlash parametri etishmayapti\n"
 "(quyidagilardan bittasi: %s)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
 msgstr ""
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr ""
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr ""
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "yangilash uchun hech narsa yo'q (manbani qo'shish uchun\n"
 "urpmi.addmedia buyrug'idan foydalaning)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1831,7 +1770,7 @@ msgstr ""
 "yangilash parametri etishmayapti\n"
 "(quyidagilardan bittasi: %s)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1847,122 +1786,149 @@ msgstr ""
 "\n"
 "Foydalanish:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - mavjud bo'lgan paketlar ro'yxatini ko'rsatish.\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - mavjud bo'lgan manbalar ro'yxatini ko'rsatish.\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - mavjud bo'lgan manba va uning URL'ni ko'rsatish.\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr ""
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr ""
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr ""
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr ""
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr ""
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - paketdagi fayllarni ko'rsatish.\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr ""
-"urpmq: noma'lum parametr \"-%s\", qanday foydalanishni --help bilan "
-"tekshiring\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: RPM-faylini (%s) o'qib bo'lmadi\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes'dan faqat --parallel bilan birga foydalanib bo'ladi"
+
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "Noma'lum webfetch \"%s\" !!!\n"
+
+#~ msgid "copy failed: %s"
+#~ msgstr "nusxa ko'chirish muvaffaqiyatsiz tugadi: %s"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "wget dasturi etishmayapti\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "curl dasturi etishmayapti\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "rsync dasturi etishmayapti\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "ssh dasturi etishmayapti\n"
+
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpme: noma'lum parametr \"-%s\", qanday foydalanishni --help bilan "
+#~ "tekshiring\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpmi: noma'lum parametr \"-%s\", qanday foydalanishni --help bilan "
+#~ "tekshiring\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr ""
+#~ "Bog'liqliklarni ta'minlash uchun quyidagi paketlar ham o'rnatiladi (%d Mb)"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpmq: noma'lum parametr \"-%s\", qanday foydalanishni --help bilan "
+#~ "tekshiring\n"
diff --git a/po/vi.po b/po/vi.po
index d8f2cefe..8a7ddd72 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-vi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2004-01-28 21:57+0700\n"
 "Last-Translator: Trinh Minh Thanh <tmthanh@yahoo.com>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
@@ -46,22 +46,22 @@ msgstr ""
 "Tự động cài đặt các gói...\n"
 "Bạn yêu cầu cài đặt gói %s\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "Đồng ý không?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Bỏ qua"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (Có/Không) "
@@ -71,123 +71,62 @@ msgstr " (Có/Không) "
 msgid "%s: command not found\n"
 msgstr "%s: không thấy lệnh\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
 "where [options] are from\n"
 msgstr ""
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - in thông tin trợ giúp này.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, fuzzy, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "  --group         - in ra nhóm tag: nhóm.\n"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, fuzzy, c-format
 msgid "                    defaults is %s.\n"
 msgstr "  -l             - liệt kê các tập tin trong gói tin.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Webfetch không xác định `%s' !!!\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "chỉ định giao thức không xác định cho %s"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "không thể quản lý giao thức: %s"
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "không sao chép được: %s"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "thiếu wget\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget hỏng: đi ra với %d hoặc signal %d\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "thiếu curl\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl hỏng: đi ra với %d hay signal %d\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "đang thiếu rsync\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "Không rsync được: đi ra với %d hay signal %d\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "đang thiếu ssh\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% của %s đã hoàn thành, ETA = %s, tốc độ = %s"
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% đã hoàn thành, tốc độ = %s"
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...không thu thập được: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "lỗi cú pháp trong tập cấu hình tại dòng %s"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 "phương tiện \"%s\" cố sử dụng danh sách đĩa cứng (hdlist) đang dùng rồi, "
 "phương tiện bị bỏ qua"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 "phương tiện \"%s\" cố sử dụng một danh sách đang dùng, phương tiện bị bỏ qua"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -196,43 +135,43 @@ msgstr ""
 "không thể quản lý phương tiện \"%s\" vì tập tin danh sách đã được phương "
 "tiện khác dùng rồi"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 "không thể dùng tên \"%s\" cho phương tiện chưa có tên vì nó đã được dùng rồi"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 "không nhận được phương tiện \"%s\" vào tài khoản do không tồn tại tập tin "
 "danh sách [%s]"
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr ""
 "không thể xác định phương tiện của tập tin danh sách đĩa cứng (hdlist) [%s]"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 "không thể truy cập tập tin danh sách đĩa cứng (hdlist) của \"%s\", phương "
 "tiện bị bỏ qua"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "không thể truy cập tập tin danh sách của \"%s\", phương tiện bị bỏ qua"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "đang cố bỏ qua phương tiện đang tồn tại \"%s\", tránh"
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -241,94 +180,94 @@ msgstr ""
 "phương tiện ảo \"%s\" không nên có tập tin danh sách hay hdlist được định "
 "ra, phương tiện bị bỏ qua"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "phương tiện ảo \"%s\" nên có URL rõ ràng, phương tiện bị bỏ qua"
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 "không thể tìm được tập tin danh sách đĩa cứng (hdlist) cho \"%s\", phương "
 "tiện bị bỏ qua"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "không thể tìm thấy tập tin danh sách cho \"%s\", phương tiện bị bỏ qua"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "tập tin danh sách không rõ ràng cho \"%s\", phương tiện bị bỏ qua"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "không thể xem xét tập tin danh sách cho \"%s\", phương tiện bị bỏ qua"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "có quá nhiều điểm gắn kết cho phương tiện tháo lắp \"%s\""
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "coi phương tiện tháo lắp là \"%s\""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "sử dụng thiết bị tháo lắp khác [%s] cho \"%s\""
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "không thể thu thập tên đường dẫn cho phương tiện tháo lắp \"%s\""
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "Không thể ghi tập tin cấu hình [%s]"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "ghi tập tin cấu hình [%s]"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "Không thể dùng parallel mode với use-distrib mode"
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "không thể phân tích cú pháp \"%s\" trong tập tin [%s]"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "đang kiểm tra trình quản lý song song (parallel) trong tập tin [%s]"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "tìm thấy trình quản lý song song (parallel) cho các node: %s"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "đang dùng phương tiện liên quan cho chế độ song song: %s"
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "không thể sử dụng tùy chọn song song (parallel) \"%s\""
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -337,90 +276,90 @@ msgstr ""
 "--synthesis không thể dùng với  --media, --excludemedia, --sortmedia, --"
 "update hoặc --parallel"
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "đang kiểm tra tập tin tổng hợp [%s]"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "đang kiểm tra tập tin danh sách đĩa cứng (hdlist) [%s]"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "phương tiện ảo \"%s\" không phải cục bộ, phương tiện bị bỏ qua"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "trục trặc khi đọc tập tin synthesis hay hdlist của phương tiện \"%s\""
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "thực hiện pass thứ hai để tính toán các phụ thuộc\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "bỏ qua gói tin %s"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "nên cài đặt thay vì nâng cấp gói %s"
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "không thể mở rpmdb"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "phương tiện \"%s\" đã tồn tại rồi"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr "phương tiện ảo phải là cục bộ "
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "đã thêm phương tiện %s"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "không thể truy cập phương tiện cài đặt đầu tiên"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "đang sao chép tập tin danh sách đĩa cứng (hdlist)..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "...sao chép không được"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "...sao chép hoàn thành"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
@@ -429,43 +368,49 @@ msgstr ""
 "không thể truy cập phương tiện cài đặt đầu tiên (tập tin Mandrake/base/"
 "hdlists không tìm được)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "đang thu thập tập tin hdlists..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "...hoàn thành việc thu thập"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...không thu thập được: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "mô tả hdlist không hợp lệ \"%s\" trong tập tin hdlists"
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "đang thử chọn phương tiện không tồn tại \"%s\""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "đang chọn đa phương tiện: %s"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "gỡ bỏ phương tiện \"%s\""
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -475,7 +420,7 @@ msgstr ""
 "không thể truy cập phương tiện \"%s\",\n"
 "Truy cập được nếu bạn tự gắn kết thư mục khi tạo phương tiện."
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -484,222 +429,222 @@ msgstr ""
 "phương tiện ảo \"%s\" nên có nguồn hdlist hoặc synthesis hợp lệ, phương tiện "
 "bị bỏ qua"
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "đang sao chép tập tin mô tả của \"%s\"..."
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "tính toán md5sum của hdlist nguồn hiện có (hoặc tổng hợp)"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "đang kiểm tra tập tin MD5SUM"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "đang sao chép hdlist nguồn (hoặc tổng hợp) của \"%s\"..."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "tính toán md5sum của hdlist nguồn được sao chép (hoặc tổng hợp)"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, fuzzy, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "bản sao của [%s] hỏng"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "trục trặc khi đọc tập tin tổng hợp của phương tiện \"%s\""
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "đang đọc các tập tin rpm từ [%s]"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "không thể đọc các tập tin rpm từ [%s]: %s"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "không tìm thấy các tập tin rpm từ [%s]"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "đang thu thập hdlist nguồn (hoặc tổng hợp) của \"%s\"..."
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "đã thấy hdlist được dò tìm (hoặc tổng hợp) là %s"
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "tính toán md5sum của hdlist nguồn thu thập được (hoặc tổng hợp)"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr "md5sum không khớp"
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "không thu thập được hdlist nguồn (hoặc tổng hợp)"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "không tìm thấy tập tin hdlist cho phương tiện \"%s\""
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "tập tin [%s] đang được dùng trong cùng phương tiện \"%s\" rồi"
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "không thể phân tích tập tin hdlist của \"%s\""
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "không thể ghi tập danh sách của \"%s\""
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "đang ghi tập tin danh sách cho phương tiện \"%s\""
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "không có gì được ghi trong tập tin danh sách cho \"%s\""
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "đang kiểm tra tập tin pubkey của \"%s\"..."
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...đã nhập key %s từ tập tin pubkey của \"%s\""
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "không thể nhập tập tin pubkey của \"%s\""
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "đang đọc các header từ phương tiện \"%s\""
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "xây dựng hdlist [%s]"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "xây dựng tập tin tổng hợp hdlist cho phương tiện \"%s\""
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "tìm thấy các header %d trong cache"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "đang gỡ bỏ các header cũ %d trong cache"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "gắn kết %s"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "thôi gắn kết %s"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "các mục nhập %s được đặt lại trong danh sách các phụ thuộc"
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "không có các mục nhập được đặt lại trong danh sách các phụ thuộc"
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "tên tập tin rpm [%s] không hợp lệ"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "đang thu thập tập tin rpm [%s] ..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "không thể truy cập tập tin rpm [%s]"
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "không thể đăng ký tập tin rpm"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "lỗi đăng ký các gói tin cục bộ"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "không có gói tin với tên %s"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Các gói tin sau đây chứa %s: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "có nhiều gói với cùng tên tập tin rpm \"%s\""
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "không thể phân tích đúng [%s] trên giá trị \"%s\""
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -708,64 +653,64 @@ msgstr ""
 "phương tiện \"%s\" dùng tập tin danh sách không hợp lệ:\n"
 "  có thể mirror không được cập nhật, đang thử dùng phương pháp thay thế khác"
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "phương tiện \"%s\" không chỉ ra bất kỳ vị trí nào cho các tập tin rpm"
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "Không tìm thấy gói tin %s."
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "cơ sở dữ liệu urpmi bị khóa"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "phương tiện \"%s\" không được chọn"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "không thể đọc tập tin rpm [%s] từ phương tiện \"%s\""
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 "phương tiện không rõ ràng \"%s\" được đánh dấu là tháo lắp nhưng không phải "
 "vậy"
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "không thể truy cập phương tiện \"%s\""
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "input bất thường: [%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "đang thu thập các tập tin rpm từ phương tiện \"%s\"..."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "Đang chuẩn bị..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "dùng tiến trình %d để thực thi phiên giao dịch"
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -773,82 +718,97 @@ msgstr ""
 "đã tạo phiên giao dịch cho việc cài đặt trên %s (gỡ bỏ=%d, cài đặt=%d, nâng "
 "cấp=%d)"
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr "không thể tạo phiên giao dịch"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "gỡ bỏ gói %s"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "không thể gỡ bỏ gói %s"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "thêm gói %s (id=%d, eid=%d, cập nhật=%d, tập tin=%s)"
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "không thể cài đặt gói %s"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "do thiếu %s"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "vì không thỏa mãn %s"
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr "thử xúc tiến %s"
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr "để giữ %s"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "để cài đặt %s"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "vì xung đột với %s"
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr "thôi yêu cầu"
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Chữ ký không hợp lệ (%s)"
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "Key ID không hợp lệ (%s)"
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Thiếu chữ ký (%s)"
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "khai báo proxy sai trong dòng lệnh\n"
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: không thể đọc tập tin rpm \"%s\"\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Xin lỗi, lựa chọn sai, hãy thử lại\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -865,24 +825,24 @@ msgstr ""
 "\n"
 "cách dùng:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - in thông tin trợ giúp này.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - tự động chọn một gói tin trong các gói.\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr "  --test         - xác minh nếu việc cài đặt đạt kết quả tốt.\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
@@ -890,17 +850,17 @@ msgstr ""
 "  --force        - ép buộc cầu viện ngay cả khi một số gói tin không tồn "
 "tại.\n"
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - phân phối urpmi qua các máy của alias.\n"
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - dùng root khác để thực hiện cài đặt rpm.\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -909,72 +869,62 @@ msgstr ""
 "  --use-distrib  - cấu hình nhanh chóng urpmi từ một distrib tree, giúp\n"
 "                   cài đặt/bỏ cài đặt một chroot bằng tùy chọn --root.\n"
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - chế độ verbose.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - chọn toàn bộ các gói tin khớp với sự diễn đạt.\n"
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: tùy chọn không xác định \"-%s\", xem cách dùng bằng --help\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr "các gói tin không xác định "
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "gói tin không xác định"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "việc gỡ bỏ gói tin %s sẽ phá vỡ hệ thống"
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr "Không có gì để gỡ bỏ"
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "Đang kiểm tra để gỡ bỏ các gói tin sau đây"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr "Để thỏa mãn các phụ thuộc, các gói sau đây sẽ được gỡ bỏ (%d MB)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (Có/Không) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "gỡ bỏ %s"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr "Gỡ bỏ không được"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Xin lỗi, lựa chọn sai, hãy thử lại\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -991,25 +941,25 @@ msgstr ""
 "\n"
 "Cách dùng:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - chỉ dùng phương tiện cập nhật.\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 "  --media         - chỉ dùng phương tiện được trao, ngăn cách bởi dấu phẩy.\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 "  --excludemedia - không dùng phương tiện được trao, ngăn cách bởi dấu "
 "phẩy.\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1017,19 +967,19 @@ msgstr ""
 "  --sortmedia         - xếp loại phương tiện theo các chuỗi con được ngăn "
 "cách bởi dấu phẩy.\n"
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - dùng tổng hợp (synthesis) nhận được để thay cho urpmi "
 "db.\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - phương thức verbose.\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1039,87 +989,87 @@ msgstr ""
 "  --quiet         - không in ra tên tag (mặc định nếu không đưa tag vào\n"
 "                   dòng lệnh, không tương thích với chế độ tương tác).\n"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --uniq         - không in ra các dòng giống nhau.\n"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all           - in ra toàn bộ tag.\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group         - in ra nhóm tag: nhóm.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size          - in ra kích thước tag: kích thước.\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --epoch        - in ra tag epoch: epoch.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary       - in ra tóm tắt tag: tóm tắt.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description   - in ra mô tả tag: mô tả.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr "  --sourcerpm    - in ra tag sourcerpm: source rpm.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr "  --packager     - in ra tag packager: packager.\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr "  --buildhost    - in ra tag buildhost: build host.\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --url          - in ra tag url: url.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr "  --provides      - in ra cung cấp tag: toàn bộ các cung cấp.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr "  --requires      - in ra yêu cầu tag: toàn bộ các yêu cầu.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files         - in ra tập tin tag: toàn bộ các tập tin.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr "  --conflicts     - in ra xung đột tag: toàn bộ các xung đột.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr "  --obsoletes     - in ra các dòng tag: toàn bộ dòng.\n"
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
@@ -1128,51 +1078,51 @@ msgstr ""
 "  --env          - dùng môi trường riêng (điển hình là báo cáo\n"
 "                    lỗi).\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr "  -i             - bỏ qua các dấu hiệu phân biệt trong mọi mẫu.\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - in phiên bản, phát hành và arch với tên.\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - bao gồm mã perl trực tiếp như perl -e.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 "  -a             - binary AND operator, đúng nếu cả hai expression là đúng.\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 "  -o             - binary OR operator, đúng nếu một expression là đúng.\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - unary NOT, đúng nếu expression là sai.\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr "  (              - dấu ngoặc trái để mở group expression.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr "  )              - dấu ngoặc phải để đóng group expression.\n"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
@@ -1181,12 +1131,12 @@ msgstr ""
 "callback là :\n"
 "%s\n"
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "đang dùng môi trường đặc hiệu trên %s\n"
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1203,18 +1153,18 @@ msgstr ""
 "\n"
 "sử dụng:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - dùng synthesis nhận được thay cho urpmi db.\n"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - tự động chọn các gói tin để nâng cấp hệ thống.\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
@@ -1223,7 +1173,7 @@ msgstr ""
 "  --no-uninstall - không bao giờ đề nghị gỡ cài đặt một gói, huỷ bỏ việc cài "
 "đặt.\n"
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1232,7 +1182,7 @@ msgstr ""
 "  --keep         - giữ gói đang tồn tại nếu có thể, bỏ các gói yêu cầu\n"
 "                   dẫn đến việc gỡ bỏ.\n"
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1244,37 +1194,37 @@ msgstr ""
 "                   có sẽ được cài đặt hay nâng cấp,\n"
 "                   mặc định là %d.\n"
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - độ dài phiên giao dịch nhỏ, mặc định là %d.\n"
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy         - tác động tìm kiếm fuzzy (giống như -y).\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - gói tin tiếp theo là gói nguồn (giống như -s).\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - chỉ cài đặt gói nguồn (không cài gói nhị phân).\n"
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean          - gỡ bỏ rpm khỏi cache trước tiên.\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - giữ rpm không được dùng trong cache.\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1283,7 +1233,7 @@ msgstr ""
 "  --allow-nodeps - cho phép hỏi người dùng cài đặt các gói tin\n"
 "                   mà không kiểm tra các phụ thuộc.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1292,7 +1242,7 @@ msgstr ""
 "  --allow-force  - cho phép hỏi người dùng cài đặt các gói tin mà\n"
 "                   không kiểm tra các phụ thuộc và tính toàn vẹn.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1301,22 +1251,22 @@ msgstr ""
 "  --use-distrib  - cấu hình nhanh chóng urpmi từ một distrib tree, giúp\n"
 "                   cài đặt chroot bằng tùy chọn --root.\n"
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - dùng wget để thu thập các tập tin ở xa.\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - dùng curl để thu thập các tập tin ở xa.\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - giới hạn tốc độ tải xuống.\n"
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, fuzzy, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1325,7 +1275,7 @@ msgstr ""
 "  --verify-rpm   - xác minh chữ ký rpm trước khi cài đặt.\n"
 "                   (--no-verify-rpm để tắt nó, mặc định là bật).\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1335,7 +1285,7 @@ msgstr ""
 "                    là 1080 theo mặc định (định dạng là <proxyhost[:port]"
 ">).\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1344,7 +1294,7 @@ msgstr ""
 "  --proxy-user   - chỉ định người dùng và mật khẩu cho proxy\n"
 "                   xác thực (khuôn dạng là <user:password>).\n"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1353,12 +1303,12 @@ msgstr ""
 "  --bug          - xuất ra báo cáo lỗi trong thư mục được chỉ định\n"
 "                    bởi đối số (arg) tiếp theo.\n"
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - dùng giao diện X.\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1367,7 +1317,7 @@ msgstr ""
 "  --best-output  - hãy chọn giao diện tốt nhất theo môi trường:\n"
 "                   chế độ X hay văn bản.\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1376,73 +1326,62 @@ msgstr ""
 "  --verify-rpm   - xác minh chữ ký rpm trước khi cài đặt.\n"
 "                   (--no-verify-rpm để tắt nó, mặc định là bật).\n"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - gồm đường dẫn được tách biệt bằng dấu phẩy.\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - trừ các tập tin tài liệu.\n"
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - chọn toàn bộ các tương hợp trong dòng lệnh.\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - cho phép tìm gói tin trong số các nhà cung cấp.\n"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - không tìm các nhà cung cấp để kiếm gói tin.\n"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - tác động tìm kiếm fuzzy (giống như --fuzzy.\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s             - gói tin tiếp theo kà gói nguồn (giống như --src).\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - chế độ yên lặng.\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  tên hay tập tin rpm có trong dòng lệnh sẽ được cài đặt.\n"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr ""
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "khai báo proxy sai trong dòng lệnh\n"
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: tùy chọn không xác định \"-%s\", xem cách dùng bằng --help\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr "Cái có thể được làm bằng các tập tin nhị phân khi dùng --install-src"
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1455,22 +1394,22 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr ""
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr ""
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr ""
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1480,12 +1419,12 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, fuzzy, c-format
 msgid "Install it"
 msgstr "Cài đặt không được"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1494,42 +1433,42 @@ msgstr ""
 "Thư mục [%s] đã tồn tại rồi, hãy dùng thư mục khác để ghi báo cáo lỗi hoặc "
 "xóa thư mục đó đi"
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Không thể tạo thư mục [%s] cho báo cáo lỗi"
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Chỉ cho phép người dùng cao cấp được cài đặt các gói"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "Cần một gói trong các gói %s sau đây để cài đặt:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Cần một gói trong các gói tin sau đây:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Bạn lựa chọn gì? (1-%d) "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "Cài đặt gói..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "Đang khởi tạo..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1538,12 +1477,12 @@ msgstr ""
 "Không thể cài đặt một số gói tin được yêu cầu:\n"
 "%s"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr "Đồng ý không ?"
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1554,7 +1493,7 @@ msgstr ""
 "để nâng cấp các gói khác:\n"
 "%s\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1563,14 +1502,14 @@ msgstr ""
 "Các gói sau đây phải được gỡ bỏ để nâng cấp các gói khác:\n"
 "%s"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr "Để thỏa mãn các phụ thuộc, những gói sau đây sẽ được cài đặt (%d MB)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1579,37 +1518,47 @@ msgstr ""
 "Bạn phải là root để cài đặt các phụ thuộc sau đây:\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "không thể lấy các gói nguồn, hủy bỏ"
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Hãy nạp phương tiện có tên \"%s\" trên thiết bị [%s]"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Nhấn Enter khi sẵn sàng ..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Đang tải về gói `%s'..."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% của %s đã hoàn thành, ETA = %s, tốc độ = %s"
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% đã hoàn thành, tốc độ = %s"
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Các gói tin sau đây có các chữ ký tồi"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Bạn muốn tiếp tục cài đặt không ?"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1620,57 +1569,57 @@ msgstr ""
 "%s\n"
 "Có thể bạn nên cập nhật cơ sở dữ liệu của urpmi."
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "Cài đặt không được"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr "phân phối %s"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr "đang cài đặt %s"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Đang cài đặt gói `%s' (%s/%s)..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Thử cài đặt mà không cần kiểm tra các phụ thuộc? (Có/Không)"
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Thử cố gắng cài đặt (--force)? (Có/[Không])"
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d phiên giao dịch cài đặt lỗi"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "Có khả năng cài đặt"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "Mọi thứ đã được cài đặt rồi"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr "khởi chạy lại urpmi"
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1696,22 +1645,22 @@ msgstr ""
 "\n"
 "và [tùy chọn] là từ\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - tạo phương tiện cập nhật.\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr "  --probe-synthesis - thử tìm và sử dụng tập tin synthesis.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr "  --probe-hdlist - thử tìm và sử dụng tập tin hdlist.\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
@@ -1720,7 +1669,7 @@ msgstr ""
 "  --no-probe      - không thử tìm bất kỳ tập tin hdlist hoặc\n"
 "                   synthesis.\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -1729,7 +1678,7 @@ msgstr ""
 "  --distrib      - tự động tạo mọi phương tiện từ một phương tiện cài\n"
 "                     đặt.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1740,7 +1689,7 @@ msgstr ""
 "                   phối, XXX có thể là chính, phân phối, cập nhật haybất kỳ\n"
 "                   cái gì khác đã được cấu hình  ;-)\n"
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1749,7 +1698,7 @@ msgstr ""
 "  --from         - dùng url chỉ định cho danh sách các mirror, mặc định là\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1760,7 +1709,7 @@ msgstr ""
 "                   phiên bản của phân phối được nói bởi gói phát hành\n"
 "                   Mandrake đã cài đặt.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
@@ -1769,7 +1718,7 @@ msgstr ""
 "  --arch         - dùng kiến trúc được chỉ định, mặc định là kiến trúc của\n"
 "                   gói phát hành mandrake đã cài đặt.\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
@@ -1778,73 +1727,52 @@ msgstr ""
 "  --virtual      - tạo phương tiện ảo luôn được cập nhật,\n"
 "                   chỉ cho phép tập tin:// protocol.\n"
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - không thực hiện kiểm tra tập tin MD5SUM.\n"
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - xoá thư mục cache headers.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - cố tạo các tập tin hdlist.\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"tùy chọn không xác định '%s'\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "không thể thêm các cập nhật của phiên bản cooker\n"
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "đang thu thập các mirror tại %s ..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"không cần cho --distrib vào với <đường dẫn liên quan của hdlist>"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "không cần cho --distrib vào với <đường dẫn liên quan của hdlist>"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "không thể cập nhật phương tiện \"%s\"\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"thiếu <đường dẫn liên quan của hdlist> \n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "thiếu <đường dẫn liên quan của hdlist> \n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"thiếu `with' cho phương tiện mạng\n"
+msgid "`with' missing for network media\n"
+msgstr "thiếu `with' cho phương tiện mạng\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "không thể tạo phương tiện \"%s\"\n"
@@ -1863,6 +1791,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - chọn toàn bộ các phương tiện.\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"tùy chọn không xác định '%s'\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1877,7 +1814,7 @@ msgstr ""
 "mục nhập để gỡ bỏ đang thiếu\n"
 "(một mục cho %s)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1886,27 +1823,27 @@ msgstr ""
 "cách dùng: urpmi.update [tùy chọn] <tên> ...\n"
 "nơi mà <tên> là tên phương tiện để cập nhật.\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - chỉ cập nhật phương tiện cập nhật.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr "  --force-key    - ép buộc cập nhật cho gpg key.\n"
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - chọn toàn bộ các phương tiện lắp trong.\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "Không có gì để cập nhật (dùng urpmi.addmedia để thêm phương tiện)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1915,7 +1852,7 @@ msgstr ""
 "thiếu mục cập nhật\n"
 "(một mục của %s)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1932,39 +1869,39 @@ msgstr ""
 "\n"
 "sử dụng:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - liệt kê các gói tin hiện có.\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - liệt kê phương tiện hiệc có.\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - liệt kê các phương tiện hiện có và url của chúng.\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 "  --dump-config  - dump cấu hình theo dạng của đối số urpmi.addmedia.\n"
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr "  --list-nodes   - liệt kê các node hiện có khi dùng --parallel.\n"
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - liệt kê các alias song song hiện có.\n"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
@@ -1973,7 +1910,7 @@ msgstr ""
 "  --headers      - bật ra các header cho gói được liệt kê từ urpmi db\n"
 "                   đến stdout (chỉ cho phép root).\n"
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
@@ -1981,7 +1918,7 @@ msgstr ""
 "  --sources      - đưa toàn bộ các gói nguồn trước khi tải xuống (chỉ cho "
 "phép root).\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
@@ -1990,17 +1927,17 @@ msgstr ""
 "  --use-distrib  - cấu hình nhanh urpmi từ một distrib tree.\n"
 "                   Việc này cho phép tra vấn một distro.\n"
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - in ra changelog.\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - tra vấn mở rộng tới các phụ thuộc của gói tin.\n"
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -2009,56 +1946,109 @@ msgstr ""
 "  -u              - bỏ gói tin nếu có phiên bản mới hơn đã được cài đặt "
 "rồi.\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - hoàn thành output với gói sẽ được gỡ bỏ.\n"
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - đảo ngược tìm kiếm cho cái yêu cầu gói.\n"
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -i             - in ra thông tin có ích mà người dùng đọc được.\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - in ra các nhóm với tên.\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - in ra phiên bản và phát hành với tên.\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - liệt kê các tập tin trong gói tin.\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  tên hay tập tin rpm có trong dòng lệnh được yêu cầu.\n"
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: tùy chọn không xác định \"-%s\", xem cách dùng bằng --help\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: không thể đọc tập tin rpm \"%s\"\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes chỉ được dùng với --parallel"
 
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "Webfetch không xác định `%s' !!!\n"
+
+#~ msgid "copy failed: %s"
+#~ msgstr "không sao chép được: %s"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "thiếu wget\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "wget hỏng: đi ra với %d hoặc signal %d\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "thiếu curl\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "curl hỏng: đi ra với %d hay signal %d\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "đang thiếu rsync\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "Không rsync được: đi ra với %d hay signal %d\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "đang thiếu ssh\n"
+
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpme: tùy chọn không xác định \"-%s\", xem cách dùng bằng --help\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmi: tùy chọn không xác định \"-%s\", xem cách dùng bằng --help\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr ""
+#~ "Để thỏa mãn các phụ thuộc, những gói sau đây sẽ được cài đặt (%d MB)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "không cần cho --distrib vào với <đường dẫn liên quan của hdlist>"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "thiếu <đường dẫn liên quan của hdlist> \n"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "thiếu `with' cho phương tiện mạng\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmq: tùy chọn không xác định \"-%s\", xem cách dùng bằng --help\n"
+
 #~ msgid "no webfetch (curl or wget currently) found\n"
 #~ msgstr "không tìm thấy webfetch (hiện là curl hay wget)\n"
 
diff --git a/po/wa.po b/po/wa.po
index 4b5e0760..ae297a41 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2003-05-13 12:50+0200\n"
 "Last-Translator: Lorint Hendschel <LorintHendschel@skynet.be>\n"
 "Language-Team: Walon <linux-wa@chanae.alphanet.ch>\n"
@@ -53,22 +53,22 @@ msgstr ""
 "Astalaedje otomatike des pacaedjes...\n"
 "Vos avoz dmandé l' astalaedje do pacaedje %s\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "Totafwait est i comufåt?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "'l est bon"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "Rinoncî"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (O/n) "
@@ -78,7 +78,7 @@ msgstr " (O/n) "
 msgid "%s: command not found\n"
 msgstr "%s: comande nén trovêye\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
@@ -87,117 +87,56 @@ msgstr ""
 "po s' è siervi: %s [tchuzes]\n"
 "avou les [tchuzes] prinjhes emey li djivêye chal pa dzo\n"
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - mostere ci messaedje d' aidance chal.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "   -g [goupe]     - håyner l' etikete di groupe: group.\n"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, c-format
 msgid "                    defaults is %s.\n"
 msgstr "                    li prémetou est %s.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "Programe d' aberwetaedje «%s» nén cnoxhou!!!\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "protocole nén cnoxhou defini po %s"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "nou aberweteu waibe di trové, les cis sopoirtés sont: %s\n"
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "dji n' sai manaedjî l' protocole: %s"
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "li copiaedje a fwait berwete: %s"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "wget n' est nén la\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget a fwait berwete: côde di rexhowe %d ou signå %d\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "curl n' est nén la\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl a fwait berwete: côde di rexhowe %d ou signå %d\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "rsync n' est nén la\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "rsync a fwait berwete: côde di rexhowe %d ou signå %d\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "ssh n' est nén la\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% di %s di fwait, ETA = %s, roedeu = %s"
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% di fwait, roedeu = %s"
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...l' aberwetaedje a fwait berwete: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "aroke di sintacse el fitchî d' apontiaedje al roye %s"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 "li sopoirt «%s» saye d' eployî on fitchî hdlist dedja eployî, dji passe "
 "houte do sopoirt"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 "li sopoirt «%s» saye d' eployî ene djivêye dedja eployeye, dji passe houte "
 "do sopoirt"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -206,42 +145,42 @@ msgstr ""
 "dji n' sai m' ocuper do sopoirt «%s» ca l' fitchî djivêye est ddja eployî pa "
 "èn ôte sopoirt"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 "dji n' pout eployî l' no «%s» pol sopoirt sins no, ca ci no la est ddja "
 "eployî"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 "dji n' a savou tni conte do sopoirt «%s» ca i gn a nou fitchî di djivêye [%"
 "s] k' egzistêye"
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "dji n' sai dire li sopoirt di ci fitchî hdlist chal [%s]"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "dji n' sai aveur li fitchî hdlist di «%s», dji passe houte do sopoirt"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 "dji n' sai aveur li fitchî di djivêye di «%s», dji passe houte do sopoirt"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "dji saye di passer houte do sopoirt «%s»"
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -250,96 +189,96 @@ msgstr ""
 "li forveyou sopoirt «%s» èn doet nén aveur defini di fitchî hdlist ou di "
 "djivêye des fitchîs, dji passe houte do sopoirt"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr ""
 "li forveyou sopoirt «%s» duvreut aveur ene haardpeye valude, dji passe houte "
 "do sopoirt"
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "dji n' sai trover li fitchî hdlist di «%s», dji passe houte do sopoirt"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 "dji n' sai trover li fitchî di djivêye di «%s», dji passe houte do sopoirt"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "crombe djivêye di fitchîs po «%s», dji passe houte do sopoirt"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
 "dji n' sai analijhî li fitchî di djivêye di «%s», dji passe houte do sopoirt"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "trop di ponts di montaedje pol sopoirt bodjåve «%s»"
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "dji prind li bodjåve sopoirt come «%s»"
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "eployant èn éndjin bodjåve diferin [%s] po «%s»"
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "dji n' sai aveur li tchmin pol sopoirt bodjåve «%s»"
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "dji n' sai scrire li fitchî d' apontiaedje [%s]"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "dji scrî l' fitchî d' apontiaedje [%s]"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "Dji n' sai eployî li môde paralele avou l' môde «use-distrib»"
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "dji n' sai analijhî «%s» e l' fitchî [%s]"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr ""
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr ""
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "eployaedje do sopoirt assocyî å môde paralele: %s"
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "dji n' sai eployî l' tchuze «%s» do môde paralele"
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -348,91 +287,91 @@ msgstr ""
 "--synthesis èn pout nén esse eployî avou --media, --excludemedia, --"
 "sortmedia, --update ou --parallel"
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "corwaitaedje do fitchî d' sinteze [%s]"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "corwaitaedje do fitchî hdlist [%s]"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "li forveyou sopoirt «%s» n' est nén locå, dji passe houte do sopoirt"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr ""
 "åk n' a nén stî tot léjhant li fitchî hdlist ou di sinteze do sopoirt «%s»"
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "dji fwait l' deujhinme passe po carculer les aloyances\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "dji passe houte do pacaedje %s"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "dji va-st astaler purade ki mete a djoû l' pacaedje %s"
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "dji n' sai drovi l' båze rpmdb"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "li sopoirt «%s» egzistêye dedja"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr "les forveyous sopoirts divèt esse locås"
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "sopoirt %s radjouté"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "dji n' a savou trover li prumî sopoirt d' astalaedje"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "copiaedje do fitchî hdlist..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "...li copiaedje a fwait berwete"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "...li copiaedje a stî comufåt"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
@@ -441,43 +380,49 @@ msgstr ""
 "dji n' a savou trover li prumî sopoirt d' astalaedje (nou fitchî Mandrake/"
 "base/hdlists di trové)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "aberwetaedje do fitchî hdlist..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "...l' aberwetaedje a stî comufåt"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...l' aberwetaedje a fwait berwete: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "discrijhaedje hdlist nén valide «%s» el fitchî hdlists"
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "dji saye di tchoezi l' sopoirt «%s» ki n' egzistêye nén"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "dji tchoezixh des sopoirts multipes: %s"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "«%s»"
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "dji bodje li sopoirt «%s»"
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -488,7 +433,7 @@ msgstr ""
 "çoula pout arriver metans si vos avoz monté al mwin li ridant divant di "
 "radjouter l' sopoirt d' astalaedje."
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -497,225 +442,225 @@ msgstr ""
 "li forveyou sopoirt «%s» duvreut aveur on fitchî sourdant hdlist ou di "
 "sinteze valides, dji passe houte do sopoirt"
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "copiaedje do fitchî di discrijhaedjes di «%s»..."
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr ""
 "carculaedje do md5sum do fitchî «hdlist» (ou del sinteze) k' egzistêye dedja"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "corwaitaedje do fitchî MD5SUM"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "copiaedje do sourdant «hdlist» (ou del sinteze) po «%s»..."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "copy of [%s] failed (li fitchî est pår pitit ki s' end est bizåre)"
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "carculaedje do fitchî «hdlist» (ou del sinteze) ki vént d' esse copyî"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "li copeye di [%s] a fwait berwete (li md5sum ni corespond nén)"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "åk n' a nén stî tot lejhant li fitchî di sinteze do sopoirt «%s»"
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "lejhant les fitchîs rpm foû di [%s]"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "dji n' sai lere les fitchîs rpm foû di [%s]: %s"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "nou fitchî rpm di trové foû di [%s]"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "aberwetaedje do sourdant «hdlist» (ou del sinteze) po «%s»..."
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "«hdlist» (ou sinteze) ki vént d' esse sayî trové come «%s»"
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr ""
 "dji carcule li md5sum do fitchî «hdlist» (ou del sinteze) ki vént d' esse "
 "aberweté"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr "li md5sum ni corespond nén"
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "l' aberwetaedje do sourdant «hdlist» (ou del sinteze) a fwait berwete"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "nou fitchî hdlist di trové pol sopoirt «%s»"
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "li fitchî [%s] est ddja eployî dins l' minme sopoirt «%s»"
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "dji n' sai analijhî li fitchî hdlist di «%s»"
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "dji n' sai scrire li fitchî djivêye di «%s»"
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "dji screye li fitchî d' djivêye («list») pol sopoirt «%s»"
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "rén n' a stî scrît el fitchî djivêye po «%s»"
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "corwaitaedje do fitchî avou l' clé publike da «%s»..."
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...aberwetaedje del clé %s do fitchî di clés publikes da «%s»"
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "dji n' sai aberweter li clé publike da «%s»"
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "dji lét les tiestires do sopoirt «%s»"
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "dji fwai l' fitchî hdlist [%s]"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "dji fwai li fitchî di sinteze hdlist pol sopoirt «%s»"
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "%d tiestires trovêyes el muchete"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "dji bodje %d viyès tiestires del muchete"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "dji monte %s"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "dji dismonte %s"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr ""
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "no d' fitchî rpm nén valåbe [%s]"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "aberwetaedje di fitchî rpm [%s]..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "dji n' sai aveur accès å fitchî rpm [%s]"
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "dji n' sai redjîstrer l' fitchî rpm"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "åk n' a nén stî tot-z eredjistrant les pacaedjes locås"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "nou pacaedje lomé %s"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Les pacaedjes ki shuvèt ont å dvins %s: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "i gn a pus d' on pacaedje avou l' minme no d' fitchî rpm «%s»"
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "dji n' sai analijhî comufåt [%s] pol valixhance «%s»"
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -724,62 +669,62 @@ msgstr ""
 "li sopoirt «%s» eploye ene crombe djivêye di fitchîs:\n"
 "  probåblumint ki l' muroe n' est nén a djoû, dji saye ene ôte metôde"
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "li sopoirt «%s» èn definixh nou eplaeçmint po les fitchîs rpm"
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "li pacaedje %s n' a nén stî trové."
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "båze di dnêyes urpmi serêye"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "li sopoirt «%s» n' a nén stî tchoezi"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "dji n' sai lere li fitchî rpm [%s] foû do sopoirt «%s»"
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "sopoirt «%s» nén cowerant, metou come bodjåve mins nel est nén vormint"
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "dji n' sai aveur accès å sopoirt «%s»"
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "crombe intrêye: [%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "aberwetaedje des fitchîs rpms do sopoirt «%s»..."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "Dj' aprustêye..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr ""
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -787,83 +732,98 @@ msgstr ""
 "ahivé ene transaccion po l' astalaedje so %s (oister=%d, astaler=%d, mete a "
 "djoû=%d)"
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr "dji n' sai ahiver ene transaccion"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "dji oistêye li pacaedje %s"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "dji n' sai oister l' pacaedje %s"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr ""
 "dji radjoute li pacaedje %s (id=%d, eid=%d, metaedje a djoû=%d, fitchîs=%s)"
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "dji n' sai astaler l' pacaedje %s"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "cåze di %s ki n' est nén la"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "cåze di %s ki n' est nén satisfyî"
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr ""
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr "po wårder %s"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "po-z astaler %s"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "cåze di conflits avou %s"
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr "nén dmandé"
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Sinateure nén valide (%s)"
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "ID di clé nén valide (%s)"
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "I manke li sinateure (%s)"
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "måle declaråcion do procsi sol roye di comande\n"
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: dji n' sai lere li fitchî rpm «%s»\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Mwaijhe tchuze, sayîz co ene feye\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -880,19 +840,19 @@ msgstr ""
 "\n"
 "po s' è siervi:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - mostere ci messaedje d' aidance chal.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 "  --auto         - tchoezi otomaticmint on pacaedje divins les tchuzes.\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
@@ -900,7 +860,7 @@ msgstr ""
 "  --test         - verifyî si l' astalaedje si pout fé comufåt disk' al "
 "fén.\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
@@ -908,95 +868,84 @@ msgstr ""
 "  --force        - foirci, minme si des pacaedjes k' i gn a n' egzistèt "
 "nén.\n"
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 " --parallel     - distribouwaedje di l' ovraedje d' urpmi so\n"
 "                  so sacwantès éndjoles defineyes come alias.\n"
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - eployî ene ôte raecene po l' astalaedje des rpm.\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - môde badjawe.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 "  -a             - tchoezi tos les pacaedjes ki corespondèt al ratourneure.\n"
 
-# c-format
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: tchuze «-%s» nén cnoxhowe, loukîz cmint l' eployî avou --help\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr "pacaedjes nén cnoxhous"
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "pacaedje nén cnoxhou"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "oister li pacaedje %s va spiyî vosse sistinme"
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr "Rén a oister"
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "Verifiaedje po oister les pacaedjes ki shuvèt"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
 "Po satisfyî les aloyaedjes, les pacaedjes ki shuvèt vont esse disastalés (%d "
 "Mo)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (o/N) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "dji oistêye li pacaedje %s"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr "Li oistaedje a fwait berwete"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Mwaijhe tchuze, sayîz co ene feye\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1013,24 +962,24 @@ msgstr ""
 "\n"
 "Po s' è siervi:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - eployî kel sopoirt di metaedje a djoû.\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 "  --media        - eployî rén k' les sopoirts dinés, separés pa des comas.\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 "  --excludemedia - èn nén eployî les dnés sopoirts, separés pa des comas.\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1038,19 +987,19 @@ msgstr ""
 "  --sortmedia    - relére les sopoirts sorlon les tchinnes dinêyes, "
 "separêyes pa des comas.\n"
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - eployî l' fitchî d' sinteze diné purade kel\n"
 "                   båze di dnêyes d' urpmi.\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - môde badjawe.\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1060,97 +1009,97 @@ msgstr ""
 "  --quiet         - èn nén håyner l' no des etiketes (prémetou si nole\n"
 "                    etikete dinêye sol roye di cmande, nén interactif).\n"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --uniq         - èn nén håyner les royes ki sont les minmes.\n"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all          - håyner totes les etiketes.\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group        - håyner l' etikete di groupe: group.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size         - håyner l' etikete del grandeu: size.\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --epoch        - håyner l' etikete del epoke: epoch.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary      - håyner l' etikete di rascourti: summary.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description  - håyner l' etikete di discrijhaedje: description.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr ""
 "  --sourcerpm    - håyner l' etikete «sourcerpm»: no do fitchî src.rpm "
 "sourdant.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr ""
 "  --packager     - håyner l' etikete «packager»: li ci k' a fwait "
 "l' pacaedje.\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr ""
 "  --buildhost    - håyner l' etikete «buildhost»: lodjoe wice ki l' pacaedje "
 "a stî fwait.\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr ""
 "  --url          - håyner l' etikete «url»: hårdêye avou des informåcions.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr ""
 "  --provides     - håyner l' etikete «provides»: tot çou k' est ahessî.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr ""
 "  --requires     - håyner l' etikete «requires»: tot çou k' i gn a mezåjhe.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files        - håyner l' etikete «files»: tos les fitchîs.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr "  --conflicts    - håyner l' etikete «conflicts»: tos les conflits.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr ""
 "  --obsoletes    - håyner l' etikete «obsoletes»: tos les vîs cayets.\n"
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
@@ -1159,25 +1108,25 @@ msgstr ""
 "  --env          - eployî on evironmint dné (tipike po les rapoirts\n"
 "                   di bug).\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr "  -i             - èn nén fé di diferince pititès/grandès letes.\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - mostere li modêye et release, eyet l' årtchitecteure avou "
 "l' no.\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 "  -e             - sititchî do côde perl directumint, come «perl -e».\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
@@ -1185,7 +1134,7 @@ msgstr ""
 "  -a             - operateu binaire EYET, vraiy si les deus ratourneures "
 "sont vraiyes.\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
@@ -1193,37 +1142,37 @@ msgstr ""
 "  -o             - operateu binaire OU, vraiy si ene des ratourneures est "
 "vraiye.\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 "  !              - operateu unaire NENI, vraiy si l' ratourneure est fåsse.\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
 "  (              - åtchete di hintche po drovi on groupe di ratourneures.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
 "  )              - åtchete di droete po clôre on groupe di ratourneures.\n"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
 "%s\n"
 msgstr ""
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "eployant on evironmint specifike so %s\n"
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1240,14 +1189,14 @@ msgstr ""
 "\n"
 "po s' è siervi:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - eployî l' fitchî d' sinteze diné purade kel\n"
 "                   båze di dnêyes d' urpmi.\n"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
@@ -1255,7 +1204,7 @@ msgstr ""
 "  --auto-select  - tchoezi otomaticmint les pacaedjes pol metaedje a djoû\n"
 "                   do sistinme.\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
@@ -1263,7 +1212,7 @@ msgid ""
 msgstr ""
 "  --no-uninstall - måy dimander po dizastaler on pacaedje, purade rinoncî.\n"
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1272,7 +1221,7 @@ msgstr ""
 "  --keep         - wårder les pacaedjes k' i gn a si c' est possibe,\n"
 "                   rifuzer les dmandes ki oistêyrént des pacaedjes.\n"
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1280,41 +1229,41 @@ msgid ""
 "                   default is %d.\n"
 msgstr ""
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - foirci des cweraedjes rishonnants (come -y).\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 "  --src          - li pacaedje shuvant est on pacaedje sourdant\n"
 "                   (parey ki -s).\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 "  --install-src  - astaler seulmint pacaedjes sourdant (nén les binaires).\n"
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 "  --clean        - oister del muchete les pacaedjes rpm divant d' ataker.\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - wårder el muchete les pacaedjes rpm nén eployîs.\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1323,7 +1272,7 @@ msgstr ""
 "  --allow-nodeps - permete k' on dimande a l' uzeu s' i vout astaler\n"
 "                   les pacaedjes sins verifyî les aloyances.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1333,29 +1282,29 @@ msgstr ""
 "                   les pacaedjes sins verifyî les aloyances nerén\n"
 "                   l' etegrité.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - eployî wget po-z aberweter les fitchî då lon.\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - eployî curl po-z aberweter les fitchî då lon.\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - limiter li roedeu di l' aberwetaedje.\n"
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1365,7 +1314,7 @@ msgstr ""
 "ont\n"
 "                   stî djokés (--no-resume po nel nén fé, prémetou=nén fé).\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1375,7 +1324,7 @@ msgstr ""
 "                   est 1080 (li cogne pol tchuze est <lodjoeprocsi[:pôrt]"
 ">).\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1385,7 +1334,7 @@ msgstr ""
 "                   l' otintifiaedje sol procsi (li cogne est <uzeu:"
 "sicret>).\n"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1394,12 +1343,12 @@ msgstr ""
 "  --bug          - sicrire on rapoirt di bug dins l' ridant dné come\n"
 "                   årgumint djusse après.\n"
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - eployî l' eterface X11.\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1408,7 +1357,7 @@ msgstr ""
 "  --best-output  - tchoezi li meyeuse eterface (X ou môde tecse), sorlon\n"
 "                   l' evironmint.\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1417,80 +1366,69 @@ msgstr ""
 "  --verify-rpm   - verifyî li sinateure rpm divant d' astaler.\n"
 "                   (--no-verify-rpm po n' nén l' fé, prémetou=verifyî).\n"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - tchimins separés pa des comas, a n' nén foyter.\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - èn nén astaler les fitchîs d' documintåcion.\n"
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - eployî --all-matches pol roye di comande.\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 "  -p             - fé des rcweraedjes ezès aloyances po trover on pacaedje.\n"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 "  -P             - èn nén fé des rcweraedjes ezès aloyances po trover\n"
 "                   on pacaedje.\n"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - foirci des cweraedjes rishonnants (come --fuzzy).\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 "  -s             - li pacaedje shuvant est on pacaedje sourdant\n"
 "                   (parey ki --src).\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - môde taijheu.\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  les nos ou fitchîs rpm dinés sol roye di cmande seront-st astalés.\n"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
-msgstr ""
-
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "måle declaråcion do procsi sol roye di comande\n"
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: tchuze «-%s» nén cnoxhowe, loukîz cmint l' eployî avou --help\n"
+msgstr "Tchoezixhoz l' plaece wice schaper l' fitchî"
 
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 "Çou ki s' pout fé avou les pacaedjes rpm binaires cwand c' est k' on "
 "tchoezixh «--install-src»"
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1511,22 +1449,22 @@ msgstr ""
 "\n"
 "Cwè voloz vs fé?"
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "Èn rén fé"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr "Oyi, djel vout astaler"
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr "Schaper l' fitchî"
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1541,12 +1479,12 @@ msgstr ""
 "\n"
 "Motoit vos vloz djusse li schaper. Cwè tchoezixhoz vs?"
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, c-format
 msgid "Install it"
 msgstr "L' astaler"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1555,42 +1493,42 @@ msgstr ""
 "Li ridant [%s] egzistêye dedja, eployîz è èn ôte po les rapoirts di bugs, "
 "oudonbén disfacez l'."
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "dji n' sai askepyî l' ridant [%s] po fé des rapoirts di bug"
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Seulmint li super-uzeu a l' droet d' astaler des pacaedjes"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "I gn a mezåjhe d' onk des pacaedjes ki shuvèt po-z astaler %s:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "I gn a mezåjhe d' onk des pacaedjes ki shuvèt:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Ké tchoezixhoz vs? (1-%d) "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "Astalaedje do pacaedje..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "Inicialijhaedje..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1599,12 +1537,12 @@ msgstr ""
 "Sacwants pacaedjes dimandés n' polèt nén esse astalés:\n"
 "%s"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr "estoz vs d' acoird?"
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1615,7 +1553,7 @@ msgstr ""
 "ont mezåjhe d' esse oistés po des ôtes esse metous a djoû:\n"
 "%s\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1625,16 +1563,16 @@ msgstr ""
 "djoû:\n"
 "%s"
 
-#: ../urpmi:561 ../urpmi:570
+#: ../urpmi:488 ../urpmi:497
 #, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
-"Po satisfyî les aloyaedjes, les pacaedjes aloyîs ki shuvèt vont esse astalés "
+"Po satisfyî les aloyaedjes, les %d pacaedjes shuvants vont esse astalés "
 "(%d Mo)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1643,37 +1581,47 @@ msgstr ""
 "Vos dvoz esse root po-z astaler les aloyances shuvantes:\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "dji n' a savou prinde les pacaedjes sourdants, dji lai toumer"
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "S' i vs plait metoz li sopoirt lomé «%s» el éndjin [%s]"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Tapez so «enter» cwand c' est fwait..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Dj' aberwetêye li pacaedje «%s»..."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% di %s di fwait, ETA = %s, roedeu = %s"
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% di fwait, roedeu = %s"
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Les pacaedjes ki shuvèt ont ene mwaijhe sinateure"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Voloz vs continuwer avou l' astalaedje?"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1684,57 +1632,57 @@ msgstr ""
 "%s\n"
 "Vos dvrîz motoit mete a djoû li båze di dnêyes urpmi."
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "L' astalåcion a fwait berwete"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr "dji distribouwe %s"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr "dj' astale %s"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Dj' astale li pacaedje «%s» (%s/%s)..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Sayî d' astaler sin verifyî les aloyaedjes? (o/N) "
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Sayî d' astaler co pus foirt (--force)? (o/N) "
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "I gn a-st avou %d transaccions d' astalaedje k' ont fwait berwete"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "L' astalaedje est possibe"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "tot a ddja stî astalé"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr "renondand urpmi"
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1760,23 +1708,23 @@ msgstr ""
 "\n"
 "et les [tchuzes] possibes sont\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - fé on sopoirt di metaedje a djoû.\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
 "  --probe-synthesis - sayî di trover ey eployî les fitchîs di sinteze.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr "  --probe-hdlist - sayî di trover ey eployî fitchî «hdlist».\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
@@ -1785,7 +1733,7 @@ msgstr ""
 "  --no-probe     - èn nén sayî di trover on fitchî di sinteze\n"
 "                   ou «hdlist».\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -1794,7 +1742,7 @@ msgstr ""
 "  --distrib      - fé otomaticmint tos les sopoirts a pårti d' on sopoirt\n"
 "                   d' astalåcion.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1806,7 +1754,7 @@ msgstr ""
 "                    «contrib» (tîcès contribucions), «updates» (metaedjes\n"
 "                    a djoû) ou tot l' minme cwè k' a stî apontyî ;-)\n"
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1815,7 +1763,7 @@ msgstr ""
 "  --from         - eployî li dnêye hårdêye pol djivêye des muroes,\n"
 "                   li prémetowe hårdêye est %s\n"
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1826,7 +1774,7 @@ msgstr ""
 "                   valixhance est l' cene do pacaedje «mandrake-release»\n"
 "                   d' astalé.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
@@ -1835,7 +1783,7 @@ msgstr ""
 "  --arch         - eployî li dnêye årtchitecteure, li prémetowe valixhance\n"
 "                   est l' cene do pacaedje «mandrake-release» d' astalé.\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
@@ -1844,73 +1792,53 @@ msgstr ""
 "  --virtual      - ahiver on forveyou sopoirt ki sont tofer a djoû,\n"
 "                   rén ki l' protocole «file://» est permetou.\n"
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - dismete li verifiaedje di fitchîs MD5SUM.\n"
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - netyî l' ridant muchete des tiestires.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - foirci l' askepiaedje des fitchîs «hdlist».\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"tchuzes nén cnoxhowes «%s»\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "dji n' pou radjouter des metaedjes a djoû d' ene distribucion cooker\n"
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "aberwetaedje des muroes di %s..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
+msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr ""
-"%s\n"
 "nén mezåjhe di dner li <tchmin relatif pol fitchî hdlist> avou --distrib"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "dji n' pout mete a djoû l' sopoirt «%s»\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"i manke li tchmin relatif pol fitchî hdlist\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "i manke li tchmin relatif pol fitchî hdlist\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"«with» manke pol sopoirt rantoele\n"
+msgid "`with' missing for network media\n"
+msgstr "«with» manke pol sopoirt rantoele\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "dji n' pout radjouter l' sopoirt «%s»\n"
@@ -1929,6 +1857,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - tchoezi tos les sopoirts.\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"tchuzes nén cnoxhowes «%s»\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1943,7 +1880,7 @@ msgstr ""
 "i gn a pont d' intrêye a bodjî\n"
 "(ene di %s)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1952,27 +1889,27 @@ msgstr ""
 "Po s' è siervi: urpmi.update [tchuzes] <etikete> ...\n"
 "avou <etikete> li no do sopoirt a mete a djoû.\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - mete a djoû rén kel sopoirt di metaedje a djoû.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr "  --force-key    - foircî l' metaedje a djoû del clé gpg.\n"
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - tchoezi tos les sopoirts nén bodjåves.\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "rén a mete a djoû (eployîz urpmi.addmedia po-z adjouter on sopoirt)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1981,7 +1918,7 @@ msgstr ""
 "i gn a pont d' intrêye a mete a djoû\n"
 "(ene di %s)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1998,23 +1935,23 @@ msgstr ""
 "\n"
 "Po s' è siervi:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - djivêye des pacaedjes k' i gn a.\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - djivêye des sopoirts k' i gn a.\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr ""
 "  --list-url     - djivêye des sopoirts k' i gn a et d' leus hårdêyes.\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
@@ -2022,17 +1959,17 @@ msgstr ""
 "  --dump-config  - copiaedje di l' apontiaedje dizo cogne d' èn årgumint po "
 "urpmi.addmedia.\n"
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr "  --list-nodes   - djivêye des nuks k' i gn a (eployant --parallel).\n"
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - djivêye des alias k' i gn a.\n"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
@@ -2042,7 +1979,7 @@ msgstr ""
 "                   båze di dnêyes urpmi, et les håyner sol rexhowe\n"
 "                   sitandård (stdout) -- èn pout esse fwait ki pa root.\n"
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
@@ -2050,25 +1987,25 @@ msgstr ""
 "  --sources      - diner tos les pacaedjes sourdant divant d' aberweter\n"
 "                   (èn pout esse fwait ki pa root).\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - håyner li djournå des candjmints.\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 "  -d             - sitinde li cweraedje åzès aloyances des pacaedjes.\n"
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -2077,60 +2014,118 @@ msgstr ""
 "  -u             - bodjî l' pacaedje foû del djivêye si ene modêye\n"
 "                   pus nouve est ddja astalêye.\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - rexhowe en etir avou l' pacaedjes a oister.\n"
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 "  -R             - fé l' ricweraedje å rvier, so çou k' a mezåjhe do "
 "pacaedje.\n"
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 "  -i             - håyner des ahessåvès informåcions, dins ene cogne po les "
 "djins.\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - håyner les groupes ossu avou l' no.\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - mostere li no, limeros di modêye eyet release.\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - djivêye des pacaedjes k' i gn a.\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  les nos ou fitchîs rpm dinés sol roye di comande sont rcwerous.\n"
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: tchuze «-%s» nén cnoxhowe, loukîz cmint l' eployî avou --help\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: dji n' sai lere li fitchî rpm «%s»\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes pout esse eployî seulmint avou --parallel"
 
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "Programe d' aberwetaedje «%s» nén cnoxhou!!!\n"
+
+#~ msgid "copy failed: %s"
+#~ msgstr "li copiaedje a fwait berwete: %s"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "wget n' est nén la\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "wget a fwait berwete: côde di rexhowe %d ou signå %d\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "curl n' est nén la\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "curl a fwait berwete: côde di rexhowe %d ou signå %d\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "rsync n' est nén la\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "rsync a fwait berwete: côde di rexhowe %d ou signå %d\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "ssh n' est nén la\n"
+
+# c-format
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpme: tchuze «-%s» nén cnoxhowe, loukîz cmint l' eployî avou --help\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpmi: tchuze «-%s» nén cnoxhowe, loukîz cmint l' eployî avou --help\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr ""
+#~ "Po satisfyî les aloyaedjes, les pacaedjes aloyîs ki shuvèt vont esse "
+#~ "astalés (%d Mo)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "nén mezåjhe di dner li <tchmin relatif pol fitchî hdlist> avou --distrib"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "i manke li tchmin relatif pol fitchî hdlist\n"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "«with» manke pol sopoirt rantoele\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr ""
+#~ "urpmq: tchuze «-%s» nén cnoxhowe, loukîz cmint l' eployî avou --help\n"
+
 #~ msgid "no webfetch (curl or wget currently) found\n"
 #~ msgstr "nou programe po-z aberweter (curl ou wget) di trové\n"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3c4c9d8a..e6dc0f55 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2004-03-06 12:53+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandrake Simplified Chinese <cooker-i18n@linux-mandrake.com>\n"
@@ -53,22 +53,22 @@ msgstr ""
 "自动安装软件包...\n"
 "您要求安装软件包 %s\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "这样好了吗?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "确定"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr "(是(Y)/否(n))[是]"
@@ -78,7 +78,7 @@ msgstr "(是(Y)/否(n))[是]"
 msgid "%s: command not found\n"
 msgstr "%s: 命令没找到\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
@@ -87,242 +87,181 @@ msgstr ""
 "用法：%s [选项]\n"
 "[选项]的格式为\n"
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "  -h|--help       - 打印帮助信息。\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "  -g [组]         - 限制结果为给定组。\n"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, c-format
 msgid "                    defaults is %s.\n"
 msgstr "                    默认为 %s。\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "未知 webfetch“%s”!!!\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "%s 中定义了未知的协议"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "未找到 webfetch，支持的 webfetch 是: %s\n"
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "无法处理协议: %s"
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "复制失败: %s"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "没有 wget\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget 失败: 退出代码 %d 或信号 %d\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "没有 curl\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl 失败: 退出代码 %d 或信号 %d\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "没有 rsync\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "rsync 失败: 退出代码 %d 或信号 %d\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "没有 ssh\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        已完成 %s%%，总共 %s，ETA = %s，速度 = %s"
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        已完成 %s%%，速度 = %s"
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...获取失败: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "配置文件的第 %s 行语法错误"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr "介质“%s”试图使用已经用过的 hdlist，介质被忽略"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr "介质“%s”试图打开已经用过的列表，介质被忽略"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
 "medium"
 msgstr "无法照顾介质“%s”，因为列表文件已经被另外的介质所用"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr "无法给未命名介质起名为“%s”，因为该名称已被使用"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr "无法考虑“%s”，因为不存在列表文件[%s]"
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "无法决定此 hdlist 文件[%s]的介质"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "无法访问“%s”的 hdlist 文件，介质被忽略"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "无法访问“%s”的列表文件，介质被忽略"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "试图跳过已有介质“%s”，避免中"
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
 "ignored"
 msgstr "虚拟介质“%s”不应在 hdlist 或列表文件中定义，介质被忽略"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "虚拟介质“%s”应该有清楚的 URL，介质被忽略"
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "找不到“%s”的 hdlist 文件，介质被忽略"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "找不到“%s”的列表文件，介质被忽略"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "“%s”的列表文件不连贯，介质被忽略"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "无法检查“%s”的列表文件，介质被忽略"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "可移动介质“%s”的载入点太多"
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "将可移动设备认作“%s”"
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "为“%2$s”使用不同的可移动设备[%1$s]"
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "无法获取可移动介质“%s”的路径名称"
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "无法写入配置文件[%s]"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "写入配置文件[%s]"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "无法与发行模式一起使用并行模式"
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "无法处理文件[%2$s]中的“%1$s”"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "正在检查文件[%s]中的并行处理"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "找到结点的并行处理: %s"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "并行模式时使用关联介质: %s"
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "无法使用并行选项“%s”"
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -331,133 +270,139 @@ msgstr ""
 "--synthesis 仅能和 --media, --excludemedia, --sortmedia, --update 或 --"
 "parallel 一起使用"
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "正在检查综合文件 [%s]"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "正在检查 hdlist 文件 [%s]"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "虚拟介质“%s”不是本地的，介质被忽略"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "读取介质“%s”的 hdlist 或综合文件出现问题"
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "正在执行第二遍依赖关系的计算\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "跳过软件包 %s"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "将安装而非升级软件包 %s"
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "无法打开 rpmdb"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "介质“%s”已存在"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr "虚拟介质必须位于本地"
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "已添加介质 %s"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "无法访问介质的首次安装"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "正在复制 hdlists 文件..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "...复制失败"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "...复制完成"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
 "found)"
 msgstr "无法访问首次安装介质(未发现 Mandrake/base/hdlists 文件)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "正在获取 hdlists 文件..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "...获取完成"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...获取失败: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "hdlists 文件中的 hdlist 描述“%s”无效"
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "试图选择不存在的介质“%s”"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "选择多个介质: %s"
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "“%s”"
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "删除介质“%s”"
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -467,229 +412,229 @@ msgstr ""
 "无法访问介质“%s”，\n"
 "这可能是因为您在创建介质时是手动装载的目录。"
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
 "ignored"
 msgstr "虚拟介质“%s”应该有有效的源 hdlist 或综合文件，介质被忽略"
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "正在复制“%s”的描述文件..."
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "正在计算已有源 hdlist(或综合文件)的 md5sum"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "正在检查 MD5SUM 文件"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "正在复制“%s”的源 hdlist(或综合文件)..."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "复制 [%s] 失败(文件太小了)"
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "正在计算已复制源 hdlist(或综合文件)的 md5sum..."
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "复制[%s]失败(md5sum 不匹配)"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "读取介质“%s”的综合文件出现问题"
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "正在从[%s]读取 rpm 文件"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "无法从[%s]读取 rpm 文件: %s"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "[%s] 中未发现 rpm 文件"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "正在获取“%s”的源 hdlist(或综合文件)..."
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "发现探测的 hdlist(或综合文件) 为 %s"
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "正在计算所获取的源 hdlist(或综合文件)的 md5sum"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr "md5sum 不匹配"
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "获取源 hdlist(或综合文件) 失败"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "介质“%s”未发现 hdlist 文件"
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "文件[%s]已经在相同的介质“%s”中使用"
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "无法处理“%s”的 hdlist 文件"
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "无法写入“%s”的列表文件"
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "正在写入介质“%s”的列表文件"
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "“%s”的列表文件中没有写入内容"
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "正在检查“%s”的公共密钥文件..."
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...从公钥文件“%s”中导入了密钥 %s"
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "无法导入“%s”的公共密钥文件"
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "正在从介质“%s”读取头"
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "正在创建 hdlist [%s]"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "创建介质“%s”的 hdlist 综合文件"
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "缓存中找到了 %d 个头"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "删除缓存中的 %d 个过时头"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "正在装载 %s"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "正在拆卸 %s"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "depslist 中重新分配了 %s 项"
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "depslist 中没有重新分配项"
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "无效的 rpm 文件名[%s]"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "正在获取 rpm 文件[%s]..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "无法访问 rpm 文件[%s]"
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "无法访问注册 rpm 文件"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "注册本地软件包出错"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "没有叫做 %s 的软件包"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "下列软件包里有 %s: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "有多个文件名都为“%s”的 rpm 软件包"
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "无法正确处理[%s]为值“%s”"
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -698,143 +643,158 @@ msgstr ""
 "介质“%s”使用了无效的列表文件:\n"
 "  介质可能不是最新，正在尝试使用其它方式"
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "介质“%s”没有定义任何 rpm 文件的位置"
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "未找到软件包 %s。"
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi 数据库已锁定"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "介质“%s”未选中"
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "无法从介质“%2$s”读取 rpm 文件[%1$s]"
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "非连贯介质“%s”标为可移动但实际不是"
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "无法访问介质“%s”"
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "输入格式错误: [%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "正在从介质“%s”上获取 rpm 文件..."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "正在准备..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "使用进程 %d 执行交易"
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr "已创建在 %s 上安装的交易(删除=%d，安装=%d，升级=%d)"
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr "无法创建交易"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "无法删除软件包 %s"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "无法删除软件包 %s"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "添加软件包 %s (id=%d, eid=%d, 更新=%d, 文件=%s)"
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "无法安装软件包 %s"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "原因是丢失 %s"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "原因是不满足 %s"
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr "正在试图推广 %s"
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr "为了保留 %s"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "为了安装 %s"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "原因是与 %s 冲突"
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr "未请求"
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "无效的签名(%s)"
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "无效的密钥 ID(%s)"
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "缺少签名(%s)"
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "命令的代理声明无效\n"
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: 无法读取 rpm 文件“%s”\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "对不起，选择无效，请再试一次\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -850,40 +810,40 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - 打印帮助信息。\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - 自动选中软件包。\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr "  --test         - 验证安装是否可以正确进行。\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - 强制执行, 即使某些软件包并不存在。\n"
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - 在多个机器上分布的运行 urpmi。\n"
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - 使用另一个 root 安装 rpm。\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -892,72 +852,62 @@ msgstr ""
 "  --use-distrib  - 配置 urpmi 实时从发行树中抓取，特别用于在 --root 选项\n"
 "                   下安装/卸载 chroot。\n"
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             -详细的提示。\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - 在命令行选择匹配表达式的所有包。\n"
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: 未知选项“-%s”，请用--help 检查用法\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr "未知的软件包"
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "未知的软件包"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "如果删除软件包 %s 会破坏您的系统"
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr "不需要删除任何东西。"
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "检查删除下列软件包"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr "为满足相关性要求，需要删除下列软件包(%d MB)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr "(是(y)/否(N))[否]"
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "正在删除 %s"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr "删除失败"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "对不起，选择无效，请再试一次\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -973,38 +923,38 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - 只使用升级介质。\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - 只使用列出的介质，介质之间用逗号分隔。\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - 不使用给定介质，介质之间用逗号分隔。\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr "  --sortmedia    - 根据用逗号分隔的子字符串排序介质。\n"
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr "  --synthesis    - 使用指定的综合文件而不是 urpmi db。\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  -v             -详细的提示。\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1015,137 +965,137 @@ msgstr ""
 "就是不打印，\n"
 "与会话方式不相兼容)。\n"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --uniq          - 不打印相同行。\n"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all           - 打印全部标识符。\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group         - 打印标识符组: 分组。\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size          - 打印标识符大小: 大小。\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --epoch          - 打印标识符周期: 周期。\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary       - 打印标识符摘要: 摘要。\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description   -打印标识符描述: 描述。\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr "  --sourcerpm    - 打印标识符源 rpm: 源 rpm。\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr "  --packager     - 打印标识符打包者: 打包者。\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr "  --buildhost    - 打印标识符创建主机: 创建主机。\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --url          - 打印标识符 url: url。\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr "  --provides      - 打印提供标识符: 所有的提供。\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr "  --requires      - 打印需要标识符: 所有需要。\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files         - 打印文件标识符: 所有文件。\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr "  --conflicts     - 打印冲突标识符: 所有的冲突。\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr "  --obsoletes     - 打印废除标识符: 所有的废除。\n"
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
 msgstr "  --env          - 使用指定的环境(特别是进行故障报告时)。\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr "  -i             - 忽略各种情况下的冲突。\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - 和名称一起打印版本、发行号和平台。\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - 直接保留 perl 代码，就像 perl -e。\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
 msgid ""
 "  -a             - binary AND operator, true if both expression are true.\n"
 msgstr "  -a             - 二元 AND 操作符，如果两个表达都为真，则为真。\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
 msgid ""
 "  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 "  -o             - 二元 OR 操作符，如果两个表达中的一个为真，则为真。\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - 一元 NOT，如果表达为假，则为真。\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr "  (              - 左括号用来打开一组表达。\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr "  )              - 右括号用来关闭一组表达。\n"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
@@ -1154,12 +1104,12 @@ msgstr ""
 "召回是:\n"
 "%s\n"
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "在 %s 使用指定环境\n"
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1175,25 +1125,25 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - 使用指定的综合文件而不是 urpmi db。\n"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - 自动选择升级系统的软件包。\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr "  --no-uninstall - 从不询问卸载软件包，直接中断安装。\n"
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1201,7 +1151,7 @@ msgid ""
 msgstr ""
 "  --keep         - 如果有可能就保留已有软件包，拒绝导致删除的软件包。\n"
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1211,37 +1161,37 @@ msgstr ""
 "  --split-level  - 如果将要安装或升级的软件包多于给定的软件包，就拆分为\n"
 "                   较小的交易。默认为 %d。\n"
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - 小交易长度，默认为 %d。\n"
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - 利用模糊查询(和 -y 一样)。\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - 下一个软件包是源程序包(和 -s 一样)。\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - 只安装源代码包(无二进制文件)。\n"
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "   --clean        -  首先删除缓存中的rpm。\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - 保留缓存中没有使用的rpm。\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1250,7 +1200,7 @@ msgstr ""
 "  --allow-nodeps - 允许要求用户不经过依赖性检验\n"
 "                   就安装软件包。\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1259,7 +1209,7 @@ msgstr ""
 "  --allow-force  - 允许提示用户安装软件包而不\n"
 "                   检查依赖性和完整性。\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1268,22 +1218,22 @@ msgstr ""
 "  --use-distrib  - 配置 urpmi 实时从发行树中抓取，特别用于在 --root 选项\n"
 "                   下安装 chroot。\n"
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - 用 wget 取远程文件。\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - 用 crul 取远程文件。\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - 降低下载速度。\n"
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1292,7 +1242,7 @@ msgstr ""
 "  --resume       - 续传未下载完成的文件\n"
 "                   (--no-resume 禁用它，默认是禁用的)。\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1301,7 +1251,7 @@ msgstr ""
 "  --proxy        - 使用指定的 HTTP 代理，默认的端口号是\n"
 "                   1080(格式如 <proxyhost[:port]>)。\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1310,7 +1260,7 @@ msgstr ""
 "  --proxy-user   - 指定用于代理认证的用户和\n"
 "                   口令(格式如 <用户: 口令>)。\n"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1319,12 +1269,12 @@ msgstr ""
 "  --bug          - 输出故障报告\n"
 "                   下一个参数指定输出目录。\n"
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - 使用 X 界面。\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1333,7 +1283,7 @@ msgstr ""
 "  --best-output  - 根据运行环境选择最好的界面:\n"
 "                   X 或文本模式。\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1342,73 +1292,62 @@ msgstr ""
 "  --verify-rpm   - 安装之前验证 rpm 签署。\n"
 "                   (--no-verify-rpm 禁止它，默认是激活的)。\n"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - 排除按逗号分隔的路径。\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - 排除文档文件。\n"
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - 在命令行选择所有匹配。\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - 允许在提供的项目中寻找软件包。\n"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - 不搜索提供标签中的软件包。\n"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - 利用模糊查询(和 --fuzzy 一样)。\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s             - 下一个软件包是源程序包(和 --src 一样)。\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - 安静模式。\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  命令行给出的软件包名或 rpm 文件将会被安装。\n"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr "选择保存文件的位置"
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "命令的代理声明无效\n"
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: 未知选项“-%s”，用--help 检查用法\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr "对二进制 rpm 文件使用 --install-src 将会达到什么效果"
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1429,22 +1368,22 @@ msgstr ""
 "\n"
 "您想要执行什么操作?"
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "什么也不做"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr "是，进行安装"
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr "保存文件"
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1459,54 +1398,54 @@ msgstr ""
 "\n"
 "您也可以选择只是保存相应的软件包。您要进行什么操作?"
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, c-format
 msgid "Install it"
 msgstr "安装"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr "目录 [%s] 已存在，请使用另外一个目录进行错误报告或者删除该目录"
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "无法创建故障报告的目录 [%s]"
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "只允许超级用户安装软件包"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "需要下列软件包之一才能安装 %s:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "需要下列软件包之一:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "请输入您的选择:(1-%d)"
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "软件包安装..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "正在初始化..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1515,12 +1454,12 @@ msgstr ""
 "某些要求的软件包无法安装:\n"
 "%s"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr "您同意吗?"
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1530,7 +1469,7 @@ msgstr ""
 "安装无法继续，原因是要升级其它软件包，需要先删除下列软件包:\n"
 "%s\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1539,14 +1478,14 @@ msgstr ""
 "要升级其它软件包，需要先删除下列软件包:\n"
 "%s"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr "我将另外安装下列软件包(%d MB)，以满足相关性要求"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1555,37 +1494,47 @@ msgstr ""
 "您必须以 root 身份安装下列满足依赖性需要的软件包:\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "无法读取源软件包，中止"
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "请插入标签“%s”的介质到设备 [%s]"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "准备好后按 Enter 键..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "正在下载软件包“%s”..."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        已完成 %s%%，总共 %s，ETA = %s，速度 = %s"
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        已完成 %s%%，速度 = %s"
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "下列软件包的签名有错误"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "您想继续安装吗?"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1596,57 +1545,57 @@ msgstr ""
 "%s\n"
 "您可能需要更新您的 urpmi 数据库"
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "安装失败"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr "正在分发 %s"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr "正在安装 %s"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安装软件包“%s”(%s/%s)..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "尝试忽略相关性检查而安装吗?(是(y)/否(N))[否]"
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "尝试更激烈的安装方式吗?(使用 --force)(是(y)/否(N))[否] "
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d 安装交易失败"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "可以安装"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "全部安装完成"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr "正在重新启动 urpmi"
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1669,36 +1618,36 @@ msgstr ""
 "\n"
 "而 [options] 可以来自\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - 创建一个更新介质。\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr "  --probe-synthesis - 试图查找并使用综合文件。\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr "  --probe-hdlist - 试图查找并使用 hdlist 文件。\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
 "                   hdlist file.\n"
 msgstr "  --no-probe     - 不试图查找任何综合文件或 hdlist 文件。\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr "  --distrib      - 自动从安装介质创建全部介质。\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1708,14 +1657,14 @@ msgstr ""
 "  --distrib-XXX  - 自动为发行版的某一部分创建介质，这些部分可能包括\n"
 "                   主要、贡献、更新或任何其它的配置。 ;-)\n"
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr "  --from         - 使用指定的 URL 列出镜像，默认为 %s。\n"
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1724,7 +1673,7 @@ msgid ""
 msgstr ""
 "  --version      - 使用指定发行版本，默认版本是所安装的 mandrake 发行包。\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
@@ -1733,80 +1682,59 @@ msgstr ""
 "  --arch         - 使用指定的架构，默认是所安装的 mandrake 发行版本的软件包\n"
 "                   架构。\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
 msgstr "  --virtual      - 创建常为最新的虚拟介质，只允许 file:// 协议。\n"
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - 禁用 MD5SUM 文件检查。\n"
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - 直接清除软件包头缓存。\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - 强迫生成 hdlist 文件。\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"未知的选项“%s”\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "无法添加 cooker 发行版的更新\n"
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "正在获取 %s 处的镜像..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"使用 --distrib 不需要提供 <hdlist的相对路径>"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "使用 --distrib 不需要提供 <hdlist的相对路径>"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "无法更新介质“%s”\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"<hdlist相对路径>找不到\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<hdlist相对路径>找不到\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"“with”找不到网络介质\n"
+msgid "`with' missing for network media\n"
+msgstr "“with”找不到网络介质\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "无法创建介质“%s”\n"
@@ -1825,6 +1753,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - 选择所有介质。\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"未知的选项“%s”\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1839,7 +1776,7 @@ msgstr ""
 "找不到要删除的项\n"
 "(%s中的一个)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1848,27 +1785,27 @@ msgstr ""
 "用法: urpmi.update [选项] <名称> ...\n"
 "其中 <名称> 是要删除的介质名...\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - 只使用更新介质。\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr "  --force-key    - 强制更新 gpg 密钥。\n"
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - 选择所有不可移动的介质。\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "没有要升级的软件(用 urpmi.addmedia 添加介质)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1877,7 +1814,7 @@ msgstr ""
 "找不到要升级的项\n"
 "(%s 中之一)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1893,38 +1830,38 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - 列出可用的软件包。\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - 列出可用的介质。\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - 列出可用的介质及其 URL。\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr "  --dump-config  - 以 urpmi.addmedia 参数的格式导出配置。\n"
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr "  --list-nodes   - 如果使用了 --parallel，列出所有可用的节点。\n"
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - 列出可用的并行处理别名。\n"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
@@ -1933,13 +1870,13 @@ msgstr ""
 "  --headers      - 从 urpmi 数据库提取软件包的头信息\n"
 "                   用 stdout 输出(root 专用)。\n"
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr "  --sources      - 下载前给出所有的源文件包(root 专用)。\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
@@ -1947,69 +1884,121 @@ msgid ""
 msgstr ""
 "  --use-distrib  - 配置 urpmi 实时从发行树中抓取。这将允许查询发行版。\n"
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - 打印全部更新日志。\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - 扩展软件包依赖性查询。\n"
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr "  -u             - 如果更新的版本已经安装，就删除软件包。\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - 要删除的软件包的完整输出。\n"
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - 逆序搜索所需的软件包。\n"
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -i             - 以人类可读的格式打印有用信息。\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - 打印组名。\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - 和名称一起打印版本和发行号。\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - 列出软件包中的文件。\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  需要在命令行给出名称或 rpm 文件。\n"
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: 未知选项“-%s”，请用--help 检查用法\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: 无法读取 rpm 文件“%s”\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes 仅能和 --parallel 一起使用"
+
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "未知 webfetch“%s”!!!\n"
+
+#~ msgid "copy failed: %s"
+#~ msgstr "复制失败: %s"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "没有 wget\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "wget 失败: 退出代码 %d 或信号 %d\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "没有 curl\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "curl 失败: 退出代码 %d 或信号 %d\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "没有 rsync\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "rsync 失败: 退出代码 %d 或信号 %d\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "没有 ssh\n"
+
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpme: 未知选项“-%s”，请用--help 检查用法\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmi: 未知选项“-%s”，用--help 检查用法\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr "我将另外安装下列软件包(%d MB)，以满足相关性要求"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "使用 --distrib 不需要提供 <hdlist的相对路径>"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "<hdlist相对路径>找不到\n"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "“with”找不到网络介质\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmq: 未知选项“-%s”，请用--help 检查用法\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index adf6c970..afdddc03 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zh_TW\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-24 00:36+0200\n"
 "PO-Revision-Date: 2004-04-17 21:32+0800\n"
 "Last-Translator: Hilbert <h@mandrake.org>\n"
 "Language-Team: Chinese Traditional <zh@li.org>\n"
@@ -59,22 +59,22 @@ msgstr ""
 "自動套件安裝...\n"
 "您要求安裝的套件 %s\n"
 
-#: ../_irpm:33 ../urpme:28 ../urpmi:571
+#: ../_irpm:33 ../urpme:29 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "這樣可以嗎?"
 
-#: ../_irpm:35 ../urpmi:143
+#: ../_irpm:35 ../urpm/msg.pm:37
 #, c-format
 msgid "Ok"
 msgstr "確定"
 
-#: ../_irpm:36 ../urpmi:144
+#: ../_irpm:36 ../urpm/msg.pm:38
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../_irpm:44 ../urpmi:507 ../urpmi:579
+#: ../_irpm:44 ../urpmi:434 ../urpmi:506
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) (是/否) "
@@ -84,7 +84,7 @@ msgstr " (Y/n) (是/否) "
 msgid "%s: command not found\n"
 msgstr "%s:找不到指令\n"
 
-#: ../rpm-find-leaves:10
+#: ../rpm-find-leaves:11
 #, c-format
 msgid ""
 "usage: %s [options]\n"
@@ -93,242 +93,181 @@ msgstr ""
 "使用法: %s [選項]\n"
 "其中 [選項] 是從\n"
 
-#: ../rpm-find-leaves:12
+#: ../rpm-find-leaves:13
 #, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - 顯示此說明訊息.\n"
 
-#: ../rpm-find-leaves:13
+#: ../rpm-find-leaves:14
 #, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "   -g [group]     - 限制結果到給定的群組.\n"
 
-#: ../rpm-find-leaves:14
+#: ../rpm-find-leaves:15
 #, c-format
 msgid "                    defaults is %s.\n"
 msgstr "                    預設為 %s.\n"
 
-#: ../urpm.pm:109
-#, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "未知的 webfetch `%s'!!!\n"
-
-#: ../urpm.pm:130
+#: ../urpm.pm:58
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "未知的通訊協定項目定義於 %s"
 
-#: ../urpm.pm:152
+#: ../urpm.pm:80
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "沒有找到 webfetch, 支援的 webfetch 有: %s\n"
 
-#: ../urpm.pm:168
+#: ../urpm.pm:96
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "無法處理通訊協定: %s"
 
-#: ../urpm.pm:189
-#, c-format
-msgid "copy failed: %s"
-msgstr "複製失敗: %s"
-
-#: ../urpm.pm:194
-#, c-format
-msgid "wget is missing\n"
-msgstr "wget 遺失\n"
-
-#: ../urpm.pm:240
-#, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget 失敗: 離開於 %d 或信號 %d\n"
-
-#: ../urpm.pm:243
-#, c-format
-msgid "curl is missing\n"
-msgstr "curl 遺失\n"
-
-#: ../urpm.pm:342
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl 失敗: 離開於 %d 或信號 %d\n"
-
-#: ../urpm.pm:348 ../urpm.pm:395
-#, c-format
-msgid "rsync is missing\n"
-msgstr "rsync 遺失\n"
-
-#: ../urpm.pm:392 ../urpm.pm:439
-#, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "rsync 失敗: 離開於 %d 或信號 %d\n"
-
-#: ../urpm.pm:396
-#, c-format
-msgid "ssh is missing\n"
-msgstr "ssh 遺失\n"
-
-#: ../urpm.pm:449 ../urpmi:657
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% of %s 完成, ETA = %s, 速度 = %s"
-
-#: ../urpm.pm:451 ../urpmi:660
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% 完成, 速度 = %s"
-
-#: ../urpm.pm:458 ../urpm.pm:1056 ../urpm.pm:1715 ../urpm.pm:1724
-#: ../urpm.pm:2327 ../urpm.pm:3007 ../urpmi:668 ../urpmi.addmedia:161
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...擷取失敗: %s"
-
-#: ../urpm.pm:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:138 ../urpm.pm:151 ../urpm.pm:164
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "語法錯誤於設定檔內的第 %s 行"
 
-#: ../urpm.pm:538
+#: ../urpm.pm:175
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr "媒體 \"%s\" 正在嘗試使用一個已經被使用的 hdlist, 忽略媒體"
 
-#: ../urpm.pm:544
+#: ../urpm.pm:181
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr "媒體 \"%s\" 正在嘗試使用一個已經被使用的清單, 忽略媒體"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:197
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
 "medium"
 msgstr "無法處理媒體 \"%s\" 因為另一個媒體正在使用清單檔"
 
-#: ../urpm.pm:566
+#: ../urpm.pm:203
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr "無法使用名稱 \"%s\" 給未命名的媒體因為它已經被使用了"
 
-#: ../urpm.pm:573
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr "不會考慮使用媒體 \"%s\" 因為無清單檔案 [%s] 存在"
 
-#: ../urpm.pm:577
+#: ../urpm.pm:214
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "無法決定這個 hdlist 檔案 [%s] 的媒體"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:223
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "無法存取 \"%s\" hdlist 檔案, 忽略這個媒體"
 
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:225 ../urpm.pm:2319
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "無法存取 \"%s\" 的清單檔, 忽略這個媒體"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:249
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "正在嘗試避開現存的媒體  \"%s\" , 正在避免"
 
-#: ../urpm.pm:620
+#: ../urpm.pm:257
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
 "ignored"
 msgstr "虛擬媒體 \"%s\" 不應該有定義 hdlist 或清單檔案, 忽略這個媒體"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:262
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "虛擬媒體 \"%s\" 應該有一個清楚的 url, 忽略這個媒體"
 
-#: ../urpm.pm:634
+#: ../urpm.pm:271
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "無法找到 \"%s\" hdlist 檔案, 忽略這個媒體"
 
-#: ../urpm.pm:641
+#: ../urpm.pm:278
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "無法找到 \"%s\" 清單檔案, 忽略這個媒體"
 
-#: ../urpm.pm:664
+#: ../urpm.pm:301
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "前後不一致的 \"%s\" 的清單檔案, 忽略這個媒體"
 
-#: ../urpm.pm:672
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "無法檢查 \"%s\" 的清單檔案, 忽略這個媒體"
 
-#: ../urpm.pm:705
+#: ../urpm.pm:342
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "可移動式媒體 \"%s\" 的掛載點過多"
 
-#: ../urpm.pm:706
+#: ../urpm.pm:343
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "將可移動式裝置當成 \"%s\""
 
-#: ../urpm.pm:710
+#: ../urpm.pm:347
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "使用不同的可移動式裝置 [%s] 於 \"%s\" "
 
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "無法擷取移動式媒體 \"%s\" 的路徑名稱"
 
-#: ../urpm.pm:731
+#: ../urpm.pm:368
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "無法寫入設定檔 [%s]"
 
-#: ../urpm.pm:753
+#: ../urpm.pm:390
 #, c-format
 msgid "write config file [%s]"
 msgstr "寫入設定檔 [%s]"
 
-#: ../urpm.pm:765
+#: ../urpm.pm:402
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "無法於 use-distrib 模式下使用平行模式"
 
-#: ../urpm.pm:775
+#: ../urpm.pm:412
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "無法解析 %s 檔案內的 %s"
 
-#: ../urpm.pm:786
+#: ../urpm.pm:423
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "檢驗 [%s] 檔案內的平行處理器"
 
-#: ../urpm.pm:796
+#: ../urpm.pm:433
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "在 %s 發現節點的處理器"
 
-#: ../urpm.pm:800
+#: ../urpm.pm:437
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "使用相關媒體於平行模式: %s"
 
-#: ../urpm.pm:804
+#: ../urpm.pm:441
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "無法使用平行選項 \"%s\""
 
-#: ../urpm.pm:815
+#: ../urpm.pm:452
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -337,133 +276,139 @@ msgstr ""
 "--synthesis 不能夠與 --media, --excludemedia, --sortmedia, --update 與 --"
 "parallel 使用"
 
-#: ../urpm.pm:866 ../urpm.pm:888 ../urpm.pm:1240 ../urpm.pm:1251
-#: ../urpm.pm:1312 ../urpm.pm:1329 ../urpm.pm:1412 ../urpm.pm:1469
-#: ../urpm.pm:1641 ../urpm.pm:1741 ../urpm.pm:1839 ../urpm.pm:1845
-#: ../urpm.pm:1944 ../urpm.pm:2023 ../urpm.pm:2027
+#: ../urpm.pm:503 ../urpm.pm:525 ../urpm.pm:891 ../urpm.pm:902 ../urpm.pm:963
+#: ../urpm.pm:980 ../urpm.pm:1063 ../urpm.pm:1120 ../urpm.pm:1298
+#: ../urpm.pm:1401 ../urpm.pm:1505 ../urpm.pm:1511 ../urpm.pm:1610
+#: ../urpm.pm:1689 ../urpm.pm:1693
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "檢驗綜合檔案 [%s]"
 
-#: ../urpm.pm:870 ../urpm.pm:883 ../urpm.pm:892 ../urpm.pm:1243
-#: ../urpm.pm:1254 ../urpm.pm:1318 ../urpm.pm:1324 ../urpm.pm:1417
-#: ../urpm.pm:1473 ../urpm.pm:1645 ../urpm.pm:1745 ../urpm.pm:1833
-#: ../urpm.pm:1851 ../urpm.pm:2033
+#: ../urpm.pm:507 ../urpm.pm:520 ../urpm.pm:529 ../urpm.pm:894 ../urpm.pm:905
+#: ../urpm.pm:969 ../urpm.pm:975 ../urpm.pm:1068 ../urpm.pm:1124
+#: ../urpm.pm:1302 ../urpm.pm:1405 ../urpm.pm:1499 ../urpm.pm:1517
+#: ../urpm.pm:1699
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "檢驗 hdlist 檔案 [%s]"
 
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:515 ../urpm.pm:898
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "虛擬媒體 \"%s\" 並非本地端, 忽略這個媒體"
 
-#: ../urpm.pm:901 ../urpm.pm:1261 ../urpm.pm:1337 ../urpm.pm:1421
-#: ../urpm.pm:1749
+#: ../urpm.pm:538 ../urpm.pm:912 ../urpm.pm:988 ../urpm.pm:1072
+#: ../urpm.pm:1409
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "讀取 \"%s\" 媒體的 hdlist 或綜合檔案發生問題"
 
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:544 ../urpm.pm:1649
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "正在執行第二部相依性的計算\n"
 
-#: ../urpm.pm:919
+#: ../urpm.pm:556
 #, c-format
 msgid "skipping package %s"
 msgstr "正在略過套件 %s"
 
-#: ../urpm.pm:928
+#: ../urpm.pm:565
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "會要安裝而非升級套件 %s"
 
-#: ../urpm.pm:939 ../urpm.pm:2496 ../urpm.pm:2557 ../urpm.pm:3129
-#: ../urpm.pm:3227
+#: ../urpm.pm:576 ../urpm.pm:2117 ../urpm.pm:2178 ../urpm.pm:2755
+#: ../urpm.pm:2853
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "無法開啟 rpmdb"
 
-#: ../urpm.pm:978
+#: ../urpm.pm:615
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "媒體 \"%s\" 已經存在"
 
-#: ../urpm.pm:985
+#: ../urpm.pm:622
 #, c-format
 msgid "virtual medium need to be local"
 msgstr "虛擬媒體需要是本地的"
 
-#: ../urpm.pm:1017
+#: ../urpm.pm:654
 #, c-format
 msgid "added medium %s"
 msgstr "加入的媒體 %s"
 
-#: ../urpm.pm:1033
+#: ../urpm.pm:670
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "無法存取第一個安裝媒體"
 
-#: ../urpm.pm:1037
+#: ../urpm.pm:674
 #, c-format
 msgid "copying hdlists file..."
 msgstr "複製 hdlist 檔案..."
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1092
 #, c-format
 msgid "...copying failed"
 msgstr "...複製失敗"
 
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:676 ../urpm.pm:1003 ../urpm.pm:1096
 #, c-format
 msgid "...copying done"
 msgstr "...複製完成"
 
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:678 ../urpm.pm:697 ../urpm.pm:725
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
 "found)"
 msgstr "無法存取第一個安裝媒體 (找不到 Mandrake/base/hdlists 檔案)"
 
-#: ../urpm.pm:1047
+#: ../urpm.pm:684
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "擷取 hdlists 檔案..."
 
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:691 ../urpm.pm:1391 ../urpm.pm:1932 ../urpm.pm:2628
+#: ../urpmi.addmedia:137
 #, c-format
 msgid "...retrieving done"
 msgstr "...擷取完成"
 
-#: ../urpm.pm:1076
+#: ../urpm.pm:693 ../urpm.pm:1375 ../urpm.pm:1384 ../urpm.pm:1935
+#: ../urpm.pm:2630 ../urpmi:595 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...擷取失敗: %s"
+
+#: ../urpm.pm:713
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "hdlists 檔案中有無效的 hdlist 敘述 \"%s\""
 
-#: ../urpm.pm:1121
+#: ../urpm.pm:758
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "正在嘗試選擇不存在的媒體 \"%s\""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "正在選擇多個媒體: \"%s\""
 
-#: ../urpm.pm:1123
+#: ../urpm.pm:760
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpm.pm:1139
+#: ../urpm.pm:776
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "移除媒體 \"%s\""
 
-#: ../urpm.pm:1288
+#: ../urpm.pm:939
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -473,229 +418,229 @@ msgstr ""
 "無法存取媒體 \"%s\",\n"
 "這在你建立媒體時手動掛載目錄時有可能發生."
 
-#: ../urpm.pm:1341
+#: ../urpm.pm:992
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
 "ignored"
 msgstr "虛擬媒體 \"%s\" 應該有有效的來源 hdlist 或綜合, 忽略這個媒體"
 
-#: ../urpm.pm:1349
+#: ../urpm.pm:1000
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "複製 \"%s\" 的敘述檔案..."
 
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1023 ../urpm.pm:1258
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "計算來源 hdlist 的 md5sum (或綜合)"
 
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1034 ../urpm.pm:1269
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "正在檢驗 MD5SUM 檔案"
 
-#: ../urpm.pm:1437
+#: ../urpm.pm:1088
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "正在複製 \"%s\" 的來源 hdlist (或綜合)..."
 
-#: ../urpm.pm:1450
+#: ../urpm.pm:1101
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "複製 [%s] 失敗 (檔案可疑的小)"
 
-#: ../urpm.pm:1454
+#: ../urpm.pm:1105
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "正在計算被複製的來源 hdlist (或綜合) 的 md5sum"
 
-#: ../urpm.pm:1456
+#: ../urpm.pm:1107
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "複製 [%s] 失敗 (md5sum 不合)"
 
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1128 ../urpm.pm:1306 ../urpm.pm:1613
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "讀取 \"%s\" 媒體的綜合檔案發生問題"
 
-#: ../urpm.pm:1516
+#: ../urpm.pm:1167
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "由 [%s] 讀取 rpm 檔案"
 
-#: ../urpm.pm:1535
+#: ../urpm.pm:1192
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "無法由 [%s] 讀取 rpm 套件: %s"
 
-#: ../urpm.pm:1540
+#: ../urpm.pm:1197
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "在 [%s] 內找不到 rpm 檔案"
 
-#: ../urpm.pm:1667
+#: ../urpm.pm:1324
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "正在擷取 \"%s\" 的來源 hdlist (或綜合)..."
 
-#: ../urpm.pm:1686
+#: ../urpm.pm:1346
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "發現探查到的 hdlist (或綜合) 為 %s"
 
-#: ../urpm.pm:1722
+#: ../urpm.pm:1382
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "正在計算來源 hdlist (或綜合) 的 md5sum"
 
-#: ../urpm.pm:1724
+#: ../urpm.pm:1384
 #, c-format
 msgid "md5sum mismatch"
 msgstr "md5sum 不合"
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1469
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "擷取來源 hdlist (或綜合) 失敗"
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1476
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "無媒體 \"%s\" 的 hdlist 檔案被找到"
 
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1487 ../urpm.pm:1541
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "檔案 [%s] 已經被相同的 \"%s\" 媒體所使用了"
 
-#: ../urpm.pm:1861
+#: ../urpm.pm:1527
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "無法從語法上分析 \"%s\" 的 hdlist 檔案"
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1565
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "無法寫入 \"%s\" 的清單檔案"
 
-#: ../urpm.pm:1906
+#: ../urpm.pm:1572
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "正在寫入 \"%s\" 的清單檔案"
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1574
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "沒有資料寫入 \"%s\" 的清單檔案"
 
-#: ../urpm.pm:1921
+#: ../urpm.pm:1587
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "檢驗 \"%s\" 的 pubkey 檔案..."
 
-#: ../urpm.pm:1928
+#: ../urpm.pm:1594
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...由 \"%s\" 的 pubkey 檔案匯入 key %s"
 
-#: ../urpm.pm:1931
+#: ../urpm.pm:1597
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "無法匯入 \"%s\" 的 pubkey 檔案"
 
-#: ../urpm.pm:1997
+#: ../urpm.pm:1663
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "正在讀取媒體 \"%s\" 的標頭"
 
-#: ../urpm.pm:2002
+#: ../urpm.pm:1668
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "正在建立 hdlist [%s]"
 
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:1680 ../urpm.pm:1709 ../urpmi:343
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "為媒體 \"%s\" 建立綜合檔案"
 
-#: ../urpm.pm:2063
+#: ../urpm.pm:1729
 #, c-format
 msgid "found %d headers in cache"
 msgstr "在 cache 找到 %d 個標頭"
 
-#: ../urpm.pm:2067
+#: ../urpm.pm:1733
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "正在移除 %d 個在 cache 內廢棄的標頭"
 
-#: ../urpm.pm:2267
+#: ../urpm.pm:1875
 #, c-format
 msgid "mounting %s"
 msgstr "正在掛載 %s"
 
-#: ../urpm.pm:2280
+#: ../urpm.pm:1888
 #, c-format
 msgid "unmounting %s"
 msgstr "正在卸載 %s"
 
-#: ../urpm.pm:2302
+#: ../urpm.pm:1910
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "重新安置 %s 項目於 depslist"
 
-#: ../urpm.pm:2303
+#: ../urpm.pm:1911
 #, c-format
 msgid "no entries relocated in depslist"
 msgstr "無項目被重新安置於 depslist"
 
-#: ../urpm.pm:2316
+#: ../urpm.pm:1924
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "無效的 rpm 檔案名稱 [%s]"
 
-#: ../urpm.pm:2322
+#: ../urpm.pm:1930
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "正在擷取 rpms 檔案 [%s] ..."
 
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:1937 ../urpm.pm:2797
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "無法存取 rpm 檔案 [%s]"
 
-#: ../urpm.pm:2334
+#: ../urpm.pm:1942
 #, c-format
 msgid "unable to register rpm file"
 msgstr "無法註冊 rpm 檔案"
 
-#: ../urpm.pm:2337
+#: ../urpm.pm:1945
 #, c-format
 msgid "error registering local packages"
 msgstr "註冊本地端套件錯誤"
 
-#: ../urpm.pm:2438
+#: ../urpm.pm:2058
 #, c-format
 msgid "no package named %s"
 msgstr "沒有套件命名為 %s"
 
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2061 ../urpme:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "以下套件包含 %s: %s"
 
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2256 ../urpm.pm:2300 ../urpm.pm:2326
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "有多個套件有相同 rpm 檔案名稱 \"%s\""
 
-#: ../urpm.pm:2688
+#: ../urpm.pm:2311
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "無法正確從語法上分析 [%s] 於數值 \"%s\""
 
-#: ../urpm.pm:2715
+#: ../urpm.pm:2338
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -704,142 +649,158 @@ msgstr ""
 "媒體 \"%s\" 使用一個無效的清單檔案:\n"
 "  鏡設站可能不是最新狀態, 正在嘗試使用替代方法"
 
-#: ../urpm.pm:2719
+#: ../urpm.pm:2342
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "媒體 \"%s\" 沒有定義任何 rpm 檔案位置"
 
-#: ../urpm.pm:2731
+#: ../urpm.pm:2354
 #, c-format
 msgid "package %s is not found."
 msgstr "找不到套件 %s."
 
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2394 ../urpm.pm:2409 ../urpm.pm:2433 ../urpm.pm:2448
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi 資料庫鎖住了"
 
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2500 ../urpm.pm:2503 ../urpm.pm:2533
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "未選擇媒體 \"%s\" "
 
-#: ../urpm.pm:2906
+#: ../urpm.pm:2529
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "無法由媒體 \"%s\" 讀取 [%s] rpm 檔案"
 
-#: ../urpm.pm:2914
+#: ../urpm.pm:2537
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "前後不一致的媒體 \"%s\" 標示為可移除但是事實上卻不是這麼一回事"
 
-#: ../urpm.pm:2927
+#: ../urpm.pm:2550
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "無法存取媒體 \"%s\" "
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2611
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "不合格式的輸入:[%s]"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2618
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "正在由媒體 \"%s\" 擷取 rpm 檔案..."
 
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:2695 ../urpmi:673
 #, c-format
 msgid "Preparing..."
 msgstr "準備中..."
 
-#: ../urpm.pm:3103
+#: ../urpm.pm:2728
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "正在使用 %d 程序以執行交易"
 
-#: ../urpm.pm:3133
+#: ../urpm.pm:2759
 #, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr "建立交易給 %s 上的安裝 (移除=%d, 安裝=%d, 升級=%d)"
 
-#: ../urpm.pm:3136
+#: ../urpm.pm:2762
 #, c-format
 msgid "unable to create transaction"
 msgstr "無法建立處理"
 
-#: ../urpm.pm:3144
+#: ../urpm.pm:2770
 #, c-format
 msgid "removing package %s"
 msgstr "正在移除套件 %s"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:2772
 #, c-format
 msgid "unable to remove package %s"
 msgstr "無法移除套件 %s"
 
-#: ../urpm.pm:3156
+#: ../urpm.pm:2782
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "正在新增套件 %s (id=%d, eid=%d, update=%d, file=%s)"
 
-#: ../urpm.pm:3159
+#: ../urpm.pm:2785
 #, c-format
 msgid "unable to install package %s"
 msgstr "無法安裝套件 %s"
 
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:2985 ../urpm.pm:3018
 #, c-format
 msgid "due to missing %s"
 msgstr "由於 %s 遺失"
 
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:2986 ../urpm.pm:3016
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "由於 %s 未被滿足"
 
-#: ../urpm.pm:3360
+#: ../urpm.pm:2987
 #, c-format
 msgid "trying to promote %s"
 msgstr "正在嘗試促進 %s"
 
-#: ../urpm.pm:3361
+#: ../urpm.pm:2988
 #, c-format
 msgid "in order to keep %s"
 msgstr "為了要保留 %s"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3011
 #, c-format
 msgid "in order to install %s"
 msgstr "為了要安裝 %s"
 
-#: ../urpm.pm:3394
+#: ../urpm.pm:3023
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "由於與 %s 的衝突"
 
-#: ../urpm.pm:3396
+#: ../urpm.pm:3025
 #, c-format
 msgid "unrequested"
 msgstr "未被要求"
 
-#: ../urpm.pm:3412
+#: ../urpm.pm:3041
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "無效的簽名 (%s)"
 
-#: ../urpm.pm:3439
+#: ../urpm.pm:3068
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "無效的 Key ID (%s)"
 
-#: ../urpm.pm:3441
+#: ../urpm.pm:3070
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "遺失簽名 (%s)"
 
-#: ../urpme:35
+#: ../urpm/args.pm:82 ../urpm/args.pm:88
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "於命令列上有壞的 proxy 宣告\n"
+
+#: ../urpm/args.pm:216
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: 無法讀取 rpm 檔案 \"%s\"\n"
+
+#: ../urpm/msg.pm:77
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "對不起, 錯誤選擇, 再試一次\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -855,38 +816,40 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpme:40 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
-#: ../urpmi.removemedia:36 ../urpmi.update:59 ../urpmq:40
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - 顯示此說明訊息.\n"
 
-#: ../urpme:41 ../urpmi:84
+#: ../urpme:42 ../urpmi:83
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - 自動選擇一個上等套件.\n"
 
-#: ../urpme:42 ../urpmi:125
+#: ../urpme:43 ../urpmi:124
 #, c-format
-msgid "  --test         - verify if the installation can be achieved correctly.\n"
+msgid ""
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr "  --test         - 確認安裝是否能夠正確達成.\n"
 
-#: ../urpme:43 ../urpmi:98 ../urpmq:60
+#: ../urpme:44 ../urpmi:97 ../urpmq:65
 #, c-format
-msgid "  --force        - force invocation even if some packages do not exist.\n"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - 強制實施即使某些套件不存在.\n"
 
-#: ../urpme:44 ../urpmi:103 ../urpmq:61
+#: ../urpme:45 ../urpmi:102 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - 穿過別名機器分散式的 urpmi\n"
 
-#: ../urpme:45 ../urpmi:104
+#: ../urpme:46 ../urpmi:103
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - 使用另一個 rpm 安裝的根.\n"
 
-#: ../urpme:46
+#: ../urpme:47
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -895,72 +858,62 @@ msgstr ""
 "  --use-distrib  - 由一個發行版樹即時設定 urpmi ,有用於\n"
 "                   安裝/反安裝一個 chroot 藉由 --root 選項.\n"
 
-#: ../urpme:48 ../urpmi:134 ../urpmq:73
+#: ../urpme:49 ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - 完整資訊模式.\n"
 
-#: ../urpme:49
+#: ../urpme:50
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - 選擇所有符合描述的套件.\n"
 
-#: ../urpme:68
-#, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: 未知的選項 \"-%s\", 以 --help 檢查使用方法\n"
-
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown packages"
 msgstr "未知的套件"
 
-#: ../urpme:91
+#: ../urpme:83
 #, c-format
 msgid "unknown package"
 msgstr "未知的套件"
 
-#: ../urpme:101
+#: ../urpme:93
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "移除套件 %s 將破壞您的系統"
 
-#: ../urpme:103
+#: ../urpme:95
 #, c-format
 msgid "Nothing to remove"
 msgstr "沒有東西可移除"
 
-#: ../urpme:107
+#: ../urpme:99
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "正在檢查以移除以下套件:"
 
-#: ../urpme:114
+#: ../urpme:106
 #, c-format
 msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr "為了滿足相依性, 下列套件將會被移除 (%d MB)"
 
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:108 ../urpmi:460 ../urpmi:619
 #, c-format
 msgid " (y/N) "
 msgstr " (y/N) (是/否) "
 
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:111 ../urpmi:662
 #, c-format
 msgid "removing %s"
 msgstr "正在移除 %s"
 
-#: ../urpme:123
+#: ../urpme:115
 #, c-format
 msgid "Removing failed"
 msgstr "正在移除失敗"
 
-#: ../urpme:152 ../urpmi:930
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "對不起, 錯誤選擇, 再試一次\n"
-
-#: ../urpmf:26
+#: ../urpmf:27
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -976,37 +929,38 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - 只使用更新的媒體.\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - 只使用給定的媒體, 以逗號分開.\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:43
+#: ../urpmf:35 ../urpmi:80 ../urpmq:48
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - 不使用給定的媒體, 以逗號分開.\n"
 
-#: ../urpmf:35 ../urpmi:82 ../urpmq:44
+#: ../urpmf:36 ../urpmi:81 ../urpmq:49
 #, c-format
-msgid "  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr "  --sortmedia    - 依據子字串排序媒體, 以逗號分開.\n"
 
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:50
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr "  --synthesis    - 使用給定的綜合檔案, 而不是 urpmi db.\n"
 
-#: ../urpmf:37
+#: ../urpmf:38
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - 完整資訊模式.\n"
 
-#: ../urpmf:38
+#: ../urpmf:39
 #, c-format
 msgid ""
 "  --quiet        - do not print tag name (default if no tag given on "
@@ -1016,134 +970,136 @@ msgstr ""
 "  --quiet        - 不顯示標籤名稱 (預設若無標籤給定於 命\n"
 "                   令列, 不相容於互動式模式).\n"
 
-#: ../urpmf:40
+#: ../urpmf:41
 #, c-format
 msgid "  --uniq         - do not print identical lines.\n"
 msgstr "  --uniq          - 不顯示同一的行.\n"
 
-#: ../urpmf:41
+#: ../urpmf:42
 #, c-format
 msgid "  --all          - print all tags.\n"
 msgstr "  --all          - 列印全部標籤.\n"
 
-#: ../urpmf:42
+#: ../urpmf:43
 #, c-format
 msgid "  --group        - print tag group: group.\n"
 msgstr "  --group        - 顯示標籤群組: 群組.\n"
 
-#: ../urpmf:43
+#: ../urpmf:44
 #, c-format
 msgid "  --size         - print tag size: size.\n"
 msgstr "  --size          - 顯示標籤大小: 大小.\n"
 
-#: ../urpmf:44
+#: ../urpmf:45
 #, c-format
 msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr "  --epoch          - 顯示標籤時代: 時代.\n"
 
-#: ../urpmf:45
+#: ../urpmf:46
 #, c-format
 msgid "  --summary      - print tag summary: summary.\n"
 msgstr "  --summary       - 列印標籤摘要: 摘要.\n"
 
-#: ../urpmf:46
+#: ../urpmf:47
 #, c-format
 msgid "  --description  - print tag description: description.\n"
 msgstr "  --description   - 顯示標籤描述: 描述.\n"
 
-#: ../urpmf:47
+#: ../urpmf:48
 #, c-format
 msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr "  --sourcerpm    - 顯示標籤 sourcerpm: source rpm.\n"
 
-#: ../urpmf:48
+#: ../urpmf:49
 #, c-format
 msgid "  --packager     - print tag packager: packager.\n"
 msgstr "  --packager     - 顯示標籤包裝者: 裝者.\n"
 
-#: ../urpmf:49
+#: ../urpmf:50
 #, c-format
 msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr "  --buildhost    - 顯示標籤 buildhost: build host.\n"
 
-#: ../urpmf:50
+#: ../urpmf:51
 #, c-format
 msgid "  --url          - print tag url: url.\n"
 msgstr "  --url          - 顯示標籤 url: url.\n"
 
-#: ../urpmf:51
+#: ../urpmf:52
 #, c-format
 msgid "  --provides     - print tag provides: all provides.\n"
 msgstr "  --provides     - 顯示標籤提供: 全部提供.\n"
 
-#: ../urpmf:52
+#: ../urpmf:53
 #, c-format
 msgid "  --requires     - print tag requires: all requires.\n"
 msgstr "  --requires     - 顯示標籤需要: 全部需要.\n"
 
-#: ../urpmf:53
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files        - 顯示標籤檔案: 全部檔案.\n"
 
-#: ../urpmf:54
+#: ../urpmf:55
 #, c-format
 msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr "  --conflicts     - 顯示標籤衝突: 衝突.\n"
 
-#: ../urpmf:55
+#: ../urpmf:56
 #, c-format
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr "  --obsoletes     - 顯示標籤過時: 全部過時.\n"
 
-#: ../urpmf:56 ../urpmi:118 ../urpmq:70
+#: ../urpmf:57 ../urpmi:117 ../urpmq:75
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
 msgstr "  --env          - 使用特定環境 (一般用於臭蟲回報).\n"
 
-#: ../urpmf:58
+#: ../urpmf:59
 #, c-format
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr "  -i             - 於每一個樣式中忽略大小寫分別.\n"
 
-#: ../urpmf:59 ../urpmq:85
+#: ../urpmf:60 ../urpmq:90
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - 顯示版本, 發行與 arch 名稱.\n"
 
-#: ../urpmf:60
+#: ../urpmf:61
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - 直接包含 perl 碼類似 perl -e.\n"
 
-#: ../urpmf:61
+#: ../urpmf:62
 #, c-format
-msgid "  -a             - binary AND operator, true if both expression are true.\n"
+msgid ""
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr "  -a             - 二元 AND 運算子, 真值若兩者皆真.\n"
 
-#: ../urpmf:62
+#: ../urpmf:63
 #, c-format
-msgid "  -o             - binary OR operator, true if one expression is true.\n"
+msgid ""
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr "  -o             - 二元 OR 運算子, 真值若一者為真.\n"
 
-#: ../urpmf:63
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !             - 一元 NOT, 真值若描述句為假.\n"
 
-#: ../urpmf:64
+#: ../urpmf:65
 #, c-format
 msgid "  (              - left parenthesis to open group expression.\n"
 msgstr "  (              - 左括弧以開啟群組描述句.\n"
 
-#: ../urpmf:65
+#: ../urpmf:66
 #, c-format
 msgid "  )              - right parenthesis to close group expression.\n"
 msgstr "  )              - 右括弧以關閉群組描述句.\n"
 
-#: ../urpmf:143
+#: ../urpmf:113
 #, c-format
 msgid ""
 "callback is :\n"
@@ -1152,12 +1108,12 @@ msgstr ""
 "收回回饋是 :\n"
 "%s\n"
 
-#: ../urpmf:148 ../urpmi:314 ../urpmq:180
+#: ../urpmf:118 ../urpmi:240 ../urpmq:111
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "正在使用特定的環境於 %s\n"
 
-#: ../urpmi:73
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1173,33 +1129,34 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpmi:83
+#: ../urpmi:82
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - 使用給定的綜合而不是 urpmi db.\n"
 
-#: ../urpmi:85 ../urpmq:46
+#: ../urpmi:84 ../urpmq:51
 #, c-format
-msgid "  --auto-select  - automatically select packages to upgrade the system.\n"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - 自動選擇升級系統的套件.\n"
 
-#: ../urpmi:86
+#: ../urpmi:85
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr "  --no-uninstall - 永不要求反安裝一個套件, 中斷安裝.\n"
 
-#: ../urpmi:87 ../urpmq:48
+#: ../urpmi:86 ../urpmq:53
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that leads to remove.\n"
 msgstr ""
-"  --keep         - 盡可能保留存在的套件, 拒絕"
-"                  會導致移除的被要求的套件.\n"
+"  --keep         - 盡可能保留存在的套件, 拒絕                  會導致移除的被"
+"要求的套件.\n"
 
-#: ../urpmi:89
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1207,37 +1164,37 @@ msgid ""
 "                   default is %d.\n"
 msgstr ""
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpmi:93 ../urpmq:47
+#: ../urpmi:92 ../urpmq:52
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - 加上模糊搜尋(如同 -y).\n"
 
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:61
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - 下個套件是原始碼套件 (如同 -s).\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
-#: ../urpmi:96
+#: ../urpmi:95
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - 在任何其他事前先由 cache 中移除 rpm.\n"
 
-#: ../urpmi:97
+#: ../urpmi:96
 #, c-format
 msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr "  --noclean      - 保留 cache 中未使用的 rpm.\n"
 
-#: ../urpmi:99
+#: ../urpmi:98
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1246,7 +1203,7 @@ msgstr ""
 "  --allow-nodeps - 允許要求使用者不檢查相依性\n"
 "                   安裝套件.\n"
 
-#: ../urpmi:101
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1255,29 +1212,29 @@ msgstr ""
 "  --allow-force  - 允許要求使用者安裝套件\n"
 "                   而不檢查相依性與完整性.\n"
 
-#: ../urpmi:105
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:60 ../urpmq:64
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:69
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - 使用 wget 擷取遠端檔案.\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:61 ../urpmq:65
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:70
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - 使用 curl 擷取遠端檔案.\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
 
-#: ../urpmi:110
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1286,7 +1243,7 @@ msgstr ""
 "  --resume       - 重新開始部份下載檔案的傳送\n"
 "                   (--no-resume 禁用它, 預設為禁用).\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:57 ../urpmi.update:63 ../urpmq:66
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:71
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1295,7 +1252,7 @@ msgstr ""
 "  --proxy        - 使用指定的 HTTP proxy, port number 被假設\n"
 "                   為1080 為預設值 (格式為 <proxyhost[:port]>).\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:65 ../urpmq:68
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:73
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1304,19 +1261,19 @@ msgstr ""
 "  --proxy-user   - 指定 proxy 認證的使用者與密碼\n"
 "                   (格式為 <user:password>).\n"
 
-#: ../urpmi:116
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
 msgstr ""
 
-#: ../urpmi:120
+#: ../urpmi:119
 #, c-format
 msgid "  --X            - use X interface.\n"
 msgstr "  --X            - 使用 X 界面.\n"
 
-#: ../urpmi:121
+#: ../urpmi:120
 #, c-format
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
@@ -1325,7 +1282,7 @@ msgstr ""
 "  --best-output  - 按照環境選擇最佳的界面:\n"
 "                   X 或文字模式.\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1334,73 +1291,62 @@ msgstr ""
 "  --verify-rpm   - 安裝前檢驗 rpm 簽名.\n"
 "                   (--no-verify-rpm 禁用它, 預設為啟用).\n"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - 排除以逗號分開的路徑.\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr ""
 
-#: ../urpmi:128 ../urpmq:76
+#: ../urpmi:127 ../urpmq:81
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - 選擇命令列中所有符合項目.\n"
 
-#: ../urpmi:129
+#: ../urpmi:128
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - 允許於 provides 中搜尋以找到套件.\n"
 
-#: ../urpmi:130 ../urpmq:78
+#: ../urpmi:129 ../urpmq:83
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - 不於 provides 中搜尋以找到套件.\n"
 
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:85
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - 加上模糊搜尋( 如同 --fuzzy).\n"
 
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:86
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s             - 下個套件是原始檔套件 (如同 --src).\n"
 
-#: ../urpmi:133
+#: ../urpmi:132
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - 安靜模式.\n"
 
-#: ../urpmi:135
+#: ../urpmi:134
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  於命令列指定的名稱或 rpm 檔案將會被安裝.\n"
 
-#: ../urpmi:156
+#: ../urpmi:141
 #, c-format
 msgid "Choose location to save file"
 msgstr "選擇存檔的位置"
 
-#: ../urpmi:203 ../urpmi:210 ../urpmi.addmedia:98 ../urpmi.addmedia:105
-#: ../urpmi.update:42 ../urpmi.update:49 ../urpmq:127 ../urpmq:134
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "於命令列上有壞的 proxy 宣告\n"
-
-#: ../urpmi:242
-#, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: 未知的選項 \"-%s\", 以 --help 檢查使用方法\n"
-
-#: ../urpmi:266
+#: ../urpmi:189
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr "當使用 --install-src 時隨著二元 rpm 檔案可做的事"
 
-#: ../urpmi:273
+#: ../urpmi:196
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -1421,22 +1367,22 @@ msgstr ""
 "\n"
 "您想怎麼做?"
 
-#: ../urpmi:281
+#: ../urpmi:204
 #, c-format
 msgid "Do nothing"
 msgstr "不進行任何動作"
 
-#: ../urpmi:282
+#: ../urpmi:205
 #, c-format
 msgid "Yes, really install it"
 msgstr "是的, 實在安裝它"
 
-#: ../urpmi:283 ../urpmi:300
+#: ../urpmi:206 ../urpmi:223
 #, c-format
 msgid "Save file"
 msgstr "儲存檔案"
 
-#: ../urpmi:294
+#: ../urpmi:217
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -1451,54 +1397,54 @@ msgstr ""
 "\n"
 "您或許寧願只是儲存它. 您的選擇是什麼?"
 
-#: ../urpmi:299
+#: ../urpmi:222
 #, c-format
 msgid "Install it"
 msgstr "安裝它"
 
-#: ../urpmi:306
+#: ../urpmi:231
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr "目錄 [%s] 已經存在, 請使用另一個目錄給臭蟲報告或刪除它"
 
-#: ../urpmi:306
+#: ../urpmi:232
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "無法建立 [%s] 目錄給臭蟲回報"
 
-#: ../urpmi:325
+#: ../urpmi:251
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "只有 superuser 才允許安裝套件"
 
-#: ../urpmi:458
+#: ../urpmi:384
 #, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "須要安裝下列其中之一套件 %s:"
 
-#: ../urpmi:459
+#: ../urpmi:385
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "需要下列其中一個套件:"
 
-#: ../urpmi:466
+#: ../urpmi:392
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "何者是您的選擇? (1-%d) "
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Package installation..."
 msgstr "套件安裝..."
 
-#: ../urpmi:476 ../urpmi:593
+#: ../urpmi:403 ../urpmi:520
 #, c-format
 msgid "Initializing..."
 msgstr "初始化中..."
 
-#: ../urpmi:497
+#: ../urpmi:424
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1507,12 +1453,12 @@ msgstr ""
 "某些要求的套件不能被安裝:\n"
 "%s"
 
-#: ../urpmi:502 ../urpmi:528
+#: ../urpmi:429 ../urpmi:455
 #, c-format
 msgid "do you agree ?"
 msgstr "你同意嗎?"
 
-#: ../urpmi:517
+#: ../urpmi:444
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1522,7 +1468,7 @@ msgstr ""
 "安裝無法繼續因為下列套件必須移除給其他套件來升級:\n"
 "%s\n"
 
-#: ../urpmi:523
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1531,14 +1477,14 @@ msgstr ""
 "下列套件必須移除給其他套件來升級:\n"
 "%s"
 
-#: ../urpmi:561 ../urpmi:570
-#, c-format
+#: ../urpmi:488 ../urpmi:497
+#, fuzzy, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr "為了滿足相依性, 下列套件將要被安裝. (%d MB)"
 
-#: ../urpmi:567
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1547,37 +1493,47 @@ msgstr ""
 "您需要為 root 以安裝下列相依性項目:\n"
 "%s\n"
 
-#: ../urpmi:588 ../urpmq:353
+#: ../urpmi:515 ../urpmq:284
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "無法取得原始碼套件, 放棄"
 
-#: ../urpmi:603
+#: ../urpmi:530
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "請將具有名稱 \"%s\" 的媒體放入到裝置 [%s] 內"
 
-#: ../urpmi:604
+#: ../urpmi:531
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "準備好時請按 Enter..."
 
-#: ../urpmi:645
+#: ../urpmi:572
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "正在下載套件 `%s'..."
 
-#: ../urpmi:679
+#: ../urpmi:584
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% of %s 完成, ETA = %s, 速度 = %s"
+
+#: ../urpmi:587
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% 完成, 速度 = %s"
+
+#: ../urpmi:606
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "下列套件有壞的簽名"
 
-#: ../urpmi:680
+#: ../urpmi:607
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "您要繼續進行安裝嗎?"
 
-#: ../urpmi:700 ../urpmi:822
+#: ../urpmi:627 ../urpmi:749
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1588,57 +1544,57 @@ msgstr ""
 "%s\n"
 "您或許要更新您的 urpmi 資料庫"
 
-#: ../urpmi:710 ../urpmi:763 ../urpmi:782 ../urpmi:800
+#: ../urpmi:637 ../urpmi:690 ../urpmi:709 ../urpmi:727
 #, c-format
 msgid "Installation failed"
 msgstr "安裝失敗"
 
-#: ../urpmi:725
+#: ../urpmi:652
 #, c-format
 msgid "distributing %s"
 msgstr "正在發佈 %s"
 
-#: ../urpmi:733
+#: ../urpmi:660
 #, c-format
 msgid "installing %s"
 msgstr "正在安裝 %s"
 
-#: ../urpmi:748
+#: ../urpmi:675
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安裝套件 `%s' (%s/%s)..."
 
-#: ../urpmi:770
+#: ../urpmi:697
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "嘗試不檢查相依性安裝? (y/N)(是/否)"
 
-#: ../urpmi:787
+#: ../urpmi:714
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "嘗試甚至更強制的安裝方式 (--force)? (y/N)(是/否)"
 
-#: ../urpmi:827
+#: ../urpmi:754
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d 安裝處理失敗"
 
-#: ../urpmi:835
+#: ../urpmi:762
 #, c-format
 msgid "Installation is possible"
 msgstr "安裝為可能的"
 
-#: ../urpmi:838
+#: ../urpmi:765
 #, c-format
 msgid "Everything already installed"
 msgstr "每一個東西都已經安裝了"
 
-#: ../urpmi:852
+#: ../urpmi:779
 #, c-format
 msgid "restarting urpmi"
 msgstr "正在重新開始 urpmi"
 
-#: ../urpmi.addmedia:44
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1663,36 +1619,36 @@ msgstr ""
 "\n"
 "而 [選項] 來自\n"
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:55
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - 建立更新的媒體.\n"
 
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:56
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr "  --probe-synthesis - 嘗試尋找並使用綜合檔案.\n"
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:57
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr "  --probe-hdlist - 嘗試尋找並使用 hdlist 檔案.\n"
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
 "                   hdlist file.\n"
 msgstr "  --no-probe     - 不嘗試尋找綜合檔案或 hdlist 檔案.\n"
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr "  --distrib      - 自動從安裝媒體建立全部媒體.\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
 "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
@@ -1700,7 +1656,7 @@ msgid ""
 "                   anything else that has been configured ;-)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -1709,7 +1665,7 @@ msgstr ""
 "  --from         - 使用指定的 url 給鏡射站台清單, 預設為\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1717,87 +1673,66 @@ msgid ""
 "                   installed mandrake-release package.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
 "                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:80 ../urpmi.update:68
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - 清除標頭 cache 目錄.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - 強制 hdlist 檔案產生.\n"
 
-#: ../urpmi.addmedia:121 ../urpmi.removemedia:39 ../urpmi.update:73
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"未知選項 '%s'\n"
-
-#: ../urpmi.addmedia:152
+#: ../urpmi.addmedia:130
 #, c-format
 msgid "cannot add updates of a cooker distribution\n"
 msgstr "無法新增 cooker 發行版的更新\n"
 
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:135
 #, c-format
 msgid "retrieving mirrors at %s ..."
 msgstr "正在擷取鏡射站台於 %s ..."
 
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"用 --distrib 時不需要給予 <hdlist 的相對路徑>"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "用 --distrib 時不需要給予 <hdlist 的相對路徑>"
 
-#: ../urpmi.addmedia:200 ../urpmi.addmedia:223
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "無法更新媒體 \"%s\"\n"
 
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
-msgstr ""
-"%s\n"
-"<hdlist 的相對路徑> 遺失\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<hdlist 的相對路徑> 遺失\n"
 
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
-msgstr ""
-"%s\n"
-"用網路媒體時遺漏了 `with'\n"
+msgid "`with' missing for network media\n"
+msgstr "用網路媒體時遺漏了 `with'\n"
 
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:200
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "無法建立媒體 \"%s\"\n"
@@ -1816,6 +1751,15 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - 選擇全部的媒體.\n"
 
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"未知選項 '%s'\n"
+
 #: ../urpmi.removemedia:48
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
@@ -1830,7 +1774,7 @@ msgstr ""
 "要移除的項目遺失\n"
 "(%s 的其中一個)\n"
 
-#: ../urpmi.update:57
+#: ../urpmi.update:28
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -1839,27 +1783,27 @@ msgstr ""
 "用法:urpmi.update [選項] <名稱> ...\n"
 "其中 <名稱> 為要更新的媒體名稱.\n"
 
-#: ../urpmi.update:67
+#: ../urpmi.update:38
 #, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - 只更新更新的媒體.\n"
 
-#: ../urpmi.update:69
+#: ../urpmi.update:40
 #, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr ""
 
-#: ../urpmi.update:70
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - 選擇所有非移動式媒體.\n"
 
-#: ../urpmi.update:83
+#: ../urpmi.update:63
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "沒有東西可以更新 (使用 urpmi.addmedia 以新增一個媒體)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:75
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -1868,7 +1812,7 @@ msgstr ""
 "要更新的項目遺失\n"
 "(%s 的其中一個)\n"
 
-#: ../urpmq:35
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -1884,37 +1828,38 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpmq:50
+#: ../urpmq:55
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - 列出可用的的套件.\n"
 
-#: ../urpmq:51
+#: ../urpmq:56
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   -- 列出可用的媒體.\n"
 
-#: ../urpmq:52
+#: ../urpmq:57
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url   -- 列出可用的媒體與其 url.\n"
 
-#: ../urpmq:53
+#: ../urpmq:58
 #, c-format
-msgid "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
-#: ../urpmq:54
+#: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr "  --list-nodes   - 當使用 --parallel 時列出可用的節點.\n"
 
-#: ../urpmq:55
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - 列出可用的平行別名.\n"
 
-#: ../urpmq:57
+#: ../urpmq:62
 #, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
@@ -1923,85 +1868,138 @@ msgstr ""
 "  --headers      - 從 urpmi db 中萃取套件標頭到\n"
 "                 stdout (只有 root).\n"
 
-#: ../urpmq:59
+#: ../urpmq:64
 #, c-format
-msgid "  --sources      - give all source packages before downloading (root only).\n"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr "  --sources      - 下載前先給予所有原始碼套件(只有 root).\n"
 
-#: ../urpmq:62
+#: ../urpmq:67
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmq:72
+#: ../urpmq:77
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - 顯示 changelog.\n"
 
-#: ../urpmq:74
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - 延伸套件相依性的查詢.\n"
 
-#: ../urpmq:75
+#: ../urpmq:80
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr "  -u             - 若已經安裝較現今的版本則移除套件.\n"
 
-#: ../urpmq:77
+#: ../urpmq:82
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - 完整輸出要移除的套件.\n"
 
-#: ../urpmq:79
+#: ../urpmq:84
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - 逆向搜尋何者需要套件.\n"
 
-#: ../urpmq:82
+#: ../urpmq:87
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -i             - 以人類可讀形式顯示有用資訊.\n"
 
-#: ../urpmq:83
+#: ../urpmq:88
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - 顯示群組及名稱.\n"
 
-#: ../urpmq:84
+#: ../urpmq:89
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - 顯示版本與發行名稱.\n"
 
-#: ../urpmq:86
+#: ../urpmq:91
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - 顯示套件檔案.\n"
 
-#: ../urpmq:87
+#: ../urpmq:92
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  在命令列給予的名稱或 rpm 檔案會被查詢.\n"
 
-#: ../urpmq:160
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq:未知的選項 \"-%s\", 以 --help 檢查使用方法\n"
-
-#: ../urpmq:163
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: 無法讀取 rpm 檔案 \"%s\"\n"
-
-#: ../urpmq:216
+#: ../urpmq:147
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes 只能夠與 --parallel 一同使用"
 
+#~ msgid "Unknown webfetch `%s' !!!\n"
+#~ msgstr "未知的 webfetch `%s'!!!\n"
+
+#~ msgid "copy failed: %s"
+#~ msgstr "複製失敗: %s"
+
+#~ msgid "wget is missing\n"
+#~ msgstr "wget 遺失\n"
+
+#~ msgid "wget failed: exited with %d or signal %d\n"
+#~ msgstr "wget 失敗: 離開於 %d 或信號 %d\n"
+
+#~ msgid "curl is missing\n"
+#~ msgstr "curl 遺失\n"
+
+#~ msgid "curl failed: exited with %d or signal %d\n"
+#~ msgstr "curl 失敗: 離開於 %d 或信號 %d\n"
+
+#~ msgid "rsync is missing\n"
+#~ msgstr "rsync 遺失\n"
+
+#~ msgid "rsync failed: exited with %d or signal %d\n"
+#~ msgstr "rsync 失敗: 離開於 %d 或信號 %d\n"
+
+#~ msgid "ssh is missing\n"
+#~ msgstr "ssh 遺失\n"
+
+#~ msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmi: 未知的選項 \"-%s\", 以 --help 檢查使用方法\n"
+
+#~ msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmi: 未知的選項 \"-%s\", 以 --help 檢查使用方法\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed "
+#~ "(%d MB)"
+#~ msgstr "為了滿足相依性, 下列套件將要被安裝. (%d MB)"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "no need to give <relative path of hdlist> with --distrib"
+#~ msgstr ""
+#~ "%s\n"
+#~ "用 --distrib 時不需要給予 <hdlist 的相對路徑>"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "<relative path of hdlist> missing\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "<hdlist 的相對路徑> 遺失\n"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "`with' missing for network media\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "用網路媒體時遺漏了 `with'\n"
+
+#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+#~ msgstr "urpmq:未知的選項 \"-%s\", 以 --help 檢查使用方法\n"
+
 #~ msgid "no webfetch (curl or wget currently) found\n"
 #~ msgstr "找不到 webfetch (目前 curl 或 wget)\n"
 
@@ -2311,4 +2309,3 @@ msgstr "--list-nodes 只能夠與 --parallel 一同使用"
 #~ "相關套件。\n"
 #~ "   --force      - 強制執行安裝即使某些相關套件不存在。\n"
 #~ "查詢在指令行內提供的套件簡稱或套件全名。\n"
-