summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-04-16 10:14:32 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-04-16 10:14:32 +0000
commit0935d96f97b842bc5800933b6a2a9b33785db249 (patch)
tree436a8f8a726631093301e7aec9da2f0df5cef8d0
parente531460387e068c8f52aa52eb2bfcda854b46489 (diff)
downloadurpmi-0935d96f97b842bc5800933b6a2a9b33785db249.tar
urpmi-0935d96f97b842bc5800933b6a2a9b33785db249.tar.gz
urpmi-0935d96f97b842bc5800933b6a2a9b33785db249.tar.bz2
urpmi-0935d96f97b842bc5800933b6a2a9b33785db249.tar.xz
urpmi-0935d96f97b842bc5800933b6a2a9b33785db249.zip
Add the new .pm files in the po/ makefile; regenerate urpmi.pot.
-rw-r--r--po/Makefile3
-rw-r--r--po/urpmi.pot742
2 files changed, 362 insertions, 383 deletions
diff --git a/po/Makefile b/po/Makefile
index 71f1617c..ba98d570 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -7,7 +7,8 @@ PGOAL = urpmi
PL_FILES = ../_irpm ../rpm-find-leaves ../urpm.pm ../urpme ../urpmf \
../urpmi ../urpmi.addmedia \
../urpmi.removemedia ../urpmi.update ../urpmq \
- ../urpm/parallel_ka_run.pm ../urpm/parallel_ssh.pm
+ ../urpm/parallel_ka_run.pm ../urpm/parallel_ssh.pm \
+ ../urpm/msg.pm ../urpm/args.pm
# C-like files to search translatable strings in
CFILES = ./placeholder.h
diff --git a/po/urpmi.pot b/po/urpmi.pot
index 8a91082c..85060a54 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-03-17 19:03+0100\n"
+"POT-Creation-Date: 2004-04-16 11:23+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"
@@ -46,22 +46,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 ""
-#: ../_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 ""
@@ -71,382 +71,382 @@ msgstr ""
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
+#: ../urpm.pm:96
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr ""
-#: ../urpm.pm:130
+#: ../urpm.pm:117
#, c-format
msgid "unknown protocol defined for %s"
msgstr ""
-#: ../urpm.pm:152
+#: ../urpm.pm:139
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr ""
-#: ../urpm.pm:168
+#: ../urpm.pm:155
#, c-format
msgid "unable to handle protocol: %s"
msgstr ""
-#: ../urpm.pm:189
+#: ../urpm.pm:176
#, c-format
msgid "copy failed: %s"
msgstr ""
-#: ../urpm.pm:194
+#: ../urpm.pm:181
#, c-format
msgid "wget is missing\n"
msgstr ""
-#: ../urpm.pm:240
+#: ../urpm.pm:227
#, c-format
msgid "wget failed: exited with %d or signal %d\n"
msgstr ""
-#: ../urpm.pm:243
+#: ../urpm.pm:230
#, c-format
msgid "curl is missing\n"
msgstr ""
-#: ../urpm.pm:342
+#: ../urpm.pm:329
#, c-format
msgid "curl failed: exited with %d or signal %d\n"
msgstr ""
-#: ../urpm.pm:348 ../urpm.pm:395
+#: ../urpm.pm:335 ../urpm.pm:382
#, c-format
msgid "rsync is missing\n"
msgstr ""
-#: ../urpm.pm:392 ../urpm.pm:439
+#: ../urpm.pm:379 ../urpm.pm:426
#, c-format
msgid "rsync failed: exited with %d or signal %d\n"
msgstr ""
-#: ../urpm.pm:396
+#: ../urpm.pm:383
#, c-format
msgid "ssh is missing\n"
msgstr ""
-#: ../urpm.pm:449 ../urpmi:657
+#: ../urpm.pm:436 ../urpmi:584
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr ""
-#: ../urpm.pm:451 ../urpmi:660
+#: ../urpm.pm:438 ../urpmi:587
#, 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
+#: ../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:501 ../urpm.pm:514 ../urpm.pm:527
+#: ../urpm.pm:488 ../urpm.pm:501 ../urpm.pm:514
#, c-format
msgid "syntax error in config file at line %s"
msgstr ""
-#: ../urpm.pm:538
+#: ../urpm.pm:525
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr ""
-#: ../urpm.pm:544
+#: ../urpm.pm:531
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr ""
-#: ../urpm.pm:560
+#: ../urpm.pm:547
#, 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:553
#, c-format
msgid "unable to use name \"%s\" for unnamed medium because it is already used"
msgstr ""
-#: ../urpm.pm:573
+#: ../urpm.pm:560
#, c-format
msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
msgstr ""
-#: ../urpm.pm:577
+#: ../urpm.pm:564
#, c-format
msgid "unable to determine medium of this hdlist file [%s]"
msgstr ""
-#: ../urpm.pm:586
+#: ../urpm.pm:573
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr ""
-#: ../urpm.pm:588 ../urpm.pm:2696
+#: ../urpm.pm:575 ../urpm.pm:2683
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr ""
-#: ../urpm.pm:612
+#: ../urpm.pm:599
#, c-format
msgid "trying to bypass existing medium \"%s\", avoiding"
msgstr ""
-#: ../urpm.pm:620
+#: ../urpm.pm:607
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
"ignored"
msgstr ""
-#: ../urpm.pm:625
+#: ../urpm.pm:612
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr ""
-#: ../urpm.pm:634
+#: ../urpm.pm:621
#, c-format
msgid "unable to find hdlist file for \"%s\", medium ignored"
msgstr ""
-#: ../urpm.pm:641
+#: ../urpm.pm:628
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr ""
-#: ../urpm.pm:664
+#: ../urpm.pm:651
#, c-format
msgid "incoherent list file for \"%s\", medium ignored"
msgstr ""
-#: ../urpm.pm:672
+#: ../urpm.pm:659
#, c-format
msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr ""
-#: ../urpm.pm:705
+#: ../urpm.pm:692
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr ""
-#: ../urpm.pm:706
+#: ../urpm.pm:693
#, c-format
msgid "taking removable device as \"%s\""
msgstr ""
-#: ../urpm.pm:710
+#: ../urpm.pm:697
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr ""
-#: ../urpm.pm:715 ../urpm.pm:718
+#: ../urpm.pm:702 ../urpm.pm:705
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr ""
-#: ../urpm.pm:731
+#: ../urpm.pm:718
#, c-format
msgid "unable to write config file [%s]"
msgstr ""
-#: ../urpm.pm:753
+#: ../urpm.pm:740
#, c-format
msgid "write config file [%s]"
msgstr ""
-#: ../urpm.pm:765
+#: ../urpm.pm:752
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr ""
-#: ../urpm.pm:775
+#: ../urpm.pm:762
#, c-format
msgid "unable to parse \"%s\" in file [%s]"
msgstr ""
-#: ../urpm.pm:786
+#: ../urpm.pm:773
#, c-format
msgid "examining parallel handler in file [%s]"
msgstr ""
-#: ../urpm.pm:796
+#: ../urpm.pm:783
#, c-format
msgid "found parallel handler for nodes: %s"
msgstr ""
-#: ../urpm.pm:800
+#: ../urpm.pm:787
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr ""
-#: ../urpm.pm:804
+#: ../urpm.pm:791
#, c-format
msgid "unable to use parallel option \"%s\""
msgstr ""
-#: ../urpm.pm:815
+#: ../urpm.pm:802
#, 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: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
#, 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: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
#, c-format
msgid "examining hdlist file [%s]"
msgstr ""
-#: ../urpm.pm:878 ../urpm.pm:1247
+#: ../urpm.pm:865 ../urpm.pm:1234
#, 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:888 ../urpm.pm:1248 ../urpm.pm:1324 ../urpm.pm:1408
+#: ../urpm.pm:1736
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr ""
-#: ../urpm.pm:907 ../urpm.pm:1983
+#: ../urpm.pm:894 ../urpm.pm:1970
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr ""
-#: ../urpm.pm:919
+#: ../urpm.pm:906
#, c-format
msgid "skipping package %s"
msgstr ""
-#: ../urpm.pm:928
+#: ../urpm.pm:915
#, 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:926 ../urpm.pm:2483 ../urpm.pm:2544 ../urpm.pm:3119
+#: ../urpm.pm:3217
#, c-format
msgid "unable to open rpmdb"
msgstr ""
-#: ../urpm.pm:978
+#: ../urpm.pm:965
#, c-format
msgid "medium \"%s\" already exists"
msgstr ""
-#: ../urpm.pm:985
+#: ../urpm.pm:972
#, c-format
msgid "virtual medium need to be local"
msgstr ""
-#: ../urpm.pm:1017
+#: ../urpm.pm:1004
#, c-format
msgid "added medium %s"
msgstr ""
-#: ../urpm.pm:1033
+#: ../urpm.pm:1020
#, c-format
msgid "unable to access first installation medium"
msgstr ""
-#: ../urpm.pm:1037
+#: ../urpm.pm:1024
#, c-format
msgid "copying hdlists file..."
msgstr ""
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1441
+#: ../urpm.pm:1026 ../urpm.pm:1339 ../urpm.pm:1428
#, c-format
msgid "...copying failed"
msgstr ""
-#: ../urpm.pm:1039 ../urpm.pm:1352 ../urpm.pm:1445
+#: ../urpm.pm:1026 ../urpm.pm:1339 ../urpm.pm:1432
#, c-format
msgid "...copying done"
msgstr ""
-#: ../urpm.pm:1041 ../urpm.pm:1060 ../urpm.pm:1088
+#: ../urpm.pm:1028 ../urpm.pm:1047 ../urpm.pm:1075
#, c-format
msgid ""
"unable to access first installation medium (no Mandrake/base/hdlists file "
"found)"
msgstr ""
-#: ../urpm.pm:1047
+#: ../urpm.pm:1034
#, c-format
msgid "retrieving hdlists file..."
msgstr ""
-#: ../urpm.pm:1054 ../urpm.pm:1731 ../urpm.pm:2324 ../urpm.pm:3005
-#: ../urpmi.addmedia:159
+#: ../urpm.pm:1041 ../urpm.pm:1718 ../urpm.pm:2311 ../urpm.pm:2992
+#: ../urpmi.addmedia:134
#, c-format
msgid "...retrieving done"
msgstr ""
-#: ../urpm.pm:1076
+#: ../urpm.pm:1063
#, c-format
msgid "invalid hdlist description \"%s\" in hdlists file"
msgstr ""
-#: ../urpm.pm:1121
+#: ../urpm.pm:1108
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr ""
-#: ../urpm.pm:1123
+#: ../urpm.pm:1110
#, c-format
msgid "selecting multiple media: %s"
msgstr ""
-#: ../urpm.pm:1123
+#: ../urpm.pm:1110
#, c-format
msgid "\"%s\""
msgstr ""
-#: ../urpm.pm:1139
+#: ../urpm.pm:1126
#, c-format
msgid "removing medium \"%s\""
msgstr ""
-#: ../urpm.pm:1288
+#: ../urpm.pm:1275
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -454,372 +454,387 @@ msgid ""
"medium."
msgstr ""
-#: ../urpm.pm:1341
+#: ../urpm.pm:1328
#, c-format
msgid ""
"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
"ignored"
msgstr ""
-#: ../urpm.pm:1349
+#: ../urpm.pm:1336
#, c-format
msgid "copying description file of \"%s\"..."
msgstr ""
-#: ../urpm.pm:1372 ../urpm.pm:1601
+#: ../urpm.pm:1359 ../urpm.pm:1588
#, c-format
msgid "computing md5sum of existing source hdlist (or synthesis)"
msgstr ""
-#: ../urpm.pm:1383 ../urpm.pm:1612
+#: ../urpm.pm:1370 ../urpm.pm:1599
#, c-format
msgid "examining MD5SUM file"
msgstr ""
-#: ../urpm.pm:1437
+#: ../urpm.pm:1424
#, c-format
msgid "copying source hdlist (or synthesis) of \"%s\"..."
msgstr ""
-#: ../urpm.pm:1450
+#: ../urpm.pm:1437
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr ""
-#: ../urpm.pm:1454
+#: ../urpm.pm:1441
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr ""
-#: ../urpm.pm:1456
+#: ../urpm.pm:1443
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr ""
-#: ../urpm.pm:1477 ../urpm.pm:1649 ../urpm.pm:1947
+#: ../urpm.pm:1464 ../urpm.pm:1636 ../urpm.pm:1934
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr ""
-#: ../urpm.pm:1516
+#: ../urpm.pm:1503
#, c-format
msgid "reading rpm files from [%s]"
msgstr ""
-#: ../urpm.pm:1535
+#: ../urpm.pm:1522
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr ""
-#: ../urpm.pm:1540
+#: ../urpm.pm:1527
#, c-format
msgid "no rpm files found from [%s]"
msgstr ""
-#: ../urpm.pm:1667
+#: ../urpm.pm:1654
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr ""
-#: ../urpm.pm:1686
+#: ../urpm.pm:1673
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr ""
-#: ../urpm.pm:1722
+#: ../urpm.pm:1709
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr ""
-#: ../urpm.pm:1724
+#: ../urpm.pm:1711
#, c-format
msgid "md5sum mismatch"
msgstr ""
-#: ../urpm.pm:1805
+#: ../urpm.pm:1792
#, c-format
msgid "retrieval of source hdlist (or synthesis) failed"
msgstr ""
-#: ../urpm.pm:1812
+#: ../urpm.pm:1799
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr ""
-#: ../urpm.pm:1823 ../urpm.pm:1875
+#: ../urpm.pm:1810 ../urpm.pm:1862
#, c-format
msgid "file [%s] already used in the same medium \"%s\""
msgstr ""
-#: ../urpm.pm:1861
+#: ../urpm.pm:1848
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr ""
-#: ../urpm.pm:1899
+#: ../urpm.pm:1886
#, c-format
msgid "unable to write list file of \"%s\""
msgstr ""
-#: ../urpm.pm:1906
+#: ../urpm.pm:1893
#, c-format
msgid "writing list file for medium \"%s\""
msgstr ""
-#: ../urpm.pm:1908
+#: ../urpm.pm:1895
#, c-format
msgid "nothing written in list file for \"%s\""
msgstr ""
-#: ../urpm.pm:1921
+#: ../urpm.pm:1908
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr ""
-#: ../urpm.pm:1928
+#: ../urpm.pm:1915
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr ""
-#: ../urpm.pm:1931
+#: ../urpm.pm:1918
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr ""
-#: ../urpm.pm:1997
+#: ../urpm.pm:1984
#, c-format
msgid "reading headers from medium \"%s\""
msgstr ""
-#: ../urpm.pm:2002
+#: ../urpm.pm:1989
#, c-format
msgid "building hdlist [%s]"
msgstr ""
-#: ../urpm.pm:2014 ../urpm.pm:2043 ../urpmi:417
+#: ../urpm.pm:2001 ../urpm.pm:2030 ../urpmi:343
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr ""
-#: ../urpm.pm:2063
+#: ../urpm.pm:2050
#, c-format
msgid "found %d headers in cache"
msgstr ""
-#: ../urpm.pm:2067
+#: ../urpm.pm:2054
#, c-format
msgid "removing %d obsolete headers in cache"
msgstr ""
-#: ../urpm.pm:2267
+#: ../urpm.pm:2254
#, c-format
msgid "mounting %s"
msgstr ""
-#: ../urpm.pm:2280
+#: ../urpm.pm:2267
#, c-format
msgid "unmounting %s"
msgstr ""
-#: ../urpm.pm:2302
+#: ../urpm.pm:2289
#, c-format
msgid "relocated %s entries in depslist"
msgstr ""
-#: ../urpm.pm:2303
+#: ../urpm.pm:2290
#, c-format
msgid "no entries relocated in depslist"
msgstr ""
-#: ../urpm.pm:2316
+#: ../urpm.pm:2303
#, c-format
msgid "invalid rpm file name [%s]"
msgstr ""
-#: ../urpm.pm:2322
+#: ../urpm.pm:2309
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr ""
-#: ../urpm.pm:2329 ../urpm.pm:3171
+#: ../urpm.pm:2316 ../urpm.pm:3161
#, c-format
msgid "unable to access rpm file [%s]"
msgstr ""
-#: ../urpm.pm:2334
+#: ../urpm.pm:2321
#, c-format
msgid "unable to register rpm file"
msgstr ""
-#: ../urpm.pm:2337
+#: ../urpm.pm:2324
#, c-format
msgid "error registering local packages"
msgstr ""
-#: ../urpm.pm:2438
+#: ../urpm.pm:2425
#, c-format
msgid "no package named %s"
msgstr ""
-#: ../urpm.pm:2441 ../urpme:96
+#: ../urpm.pm:2428 ../urpme:83
#, c-format
msgid "The following packages contain %s: %s"
msgstr ""
-#: ../urpm.pm:2633 ../urpm.pm:2677 ../urpm.pm:2703
+#: ../urpm.pm:2620 ../urpm.pm:2664 ../urpm.pm:2690
#, c-format
msgid "there are multiple packages with the same rpm filename \"%s\""
msgstr ""
-#: ../urpm.pm:2688
+#: ../urpm.pm:2675
#, c-format
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr ""
-#: ../urpm.pm:2715
+#: ../urpm.pm:2702
#, 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:2706
#, c-format
msgid "medium \"%s\" does not define any location for rpm files"
msgstr ""
-#: ../urpm.pm:2731
+#: ../urpm.pm:2718
#, c-format
msgid "package %s is not found."
msgstr ""
-#: ../urpm.pm:2771 ../urpm.pm:2786 ../urpm.pm:2810 ../urpm.pm:2825
+#: ../urpm.pm:2758 ../urpm.pm:2773 ../urpm.pm:2797 ../urpm.pm:2812
#, c-format
msgid "urpmi database locked"
msgstr ""
-#: ../urpm.pm:2877 ../urpm.pm:2880 ../urpm.pm:2910
+#: ../urpm.pm:2864 ../urpm.pm:2867 ../urpm.pm:2897
#, c-format
msgid "medium \"%s\" is not selected"
msgstr ""
-#: ../urpm.pm:2906
+#: ../urpm.pm:2893
#, c-format
msgid "unable to read rpm file [%s] from medium \"%s\""
msgstr ""
-#: ../urpm.pm:2914
+#: ../urpm.pm:2901
#, c-format
msgid "incoherent medium \"%s\" marked removable but not really"
msgstr ""
-#: ../urpm.pm:2927
+#: ../urpm.pm:2914
#, c-format
msgid "unable to access medium \"%s\""
msgstr ""
-#: ../urpm.pm:2988
+#: ../urpm.pm:2975
#, c-format
msgid "malformed input: [%s]"
msgstr ""
-#: ../urpm.pm:2995
+#: ../urpm.pm:2982
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr ""
-#: ../urpm.pm:3072 ../urpmi:746
+#: ../urpm.pm:3059 ../urpmi:673
#, c-format
msgid "Preparing..."
msgstr ""
-#: ../urpm.pm:3103
+#: ../urpm.pm:3092
#, c-format
msgid "using process %d for executing transaction"
msgstr ""
-#: ../urpm.pm:3133
+#: ../urpm.pm:3123
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
-#: ../urpm.pm:3136
+#: ../urpm.pm:3126
#, c-format
msgid "unable to create transaction"
msgstr ""
-#: ../urpm.pm:3144
+#: ../urpm.pm:3134
#, c-format
msgid "removing package %s"
msgstr ""
-#: ../urpm.pm:3146
+#: ../urpm.pm:3136
#, c-format
msgid "unable to remove package %s"
msgstr ""
-#: ../urpm.pm:3156
+#: ../urpm.pm:3146
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr ""
-#: ../urpm.pm:3159
+#: ../urpm.pm:3149
#, c-format
msgid "unable to install package %s"
msgstr ""
-#: ../urpm.pm:3358 ../urpm.pm:3389
+#: ../urpm.pm:3348 ../urpm.pm:3379
#, c-format
msgid "due to missing %s"
msgstr ""
-#: ../urpm.pm:3359 ../urpm.pm:3387
+#: ../urpm.pm:3349 ../urpm.pm:3377
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpm.pm:3360
+#: ../urpm.pm:3350
#, c-format
msgid "trying to promote %s"
msgstr ""
-#: ../urpm.pm:3361
+#: ../urpm.pm:3351
#, c-format
msgid "in order to keep %s"
msgstr ""
-#: ../urpm.pm:3382
+#: ../urpm.pm:3372
#, c-format
msgid "in order to install %s"
msgstr ""
-#: ../urpm.pm:3394
+#: ../urpm.pm:3384
#, c-format
msgid "due to conflicts with %s"
msgstr ""
-#: ../urpm.pm:3396
+#: ../urpm.pm:3386
#, c-format
msgid "unrequested"
msgstr ""
-#: ../urpm.pm:3412
+#: ../urpm.pm:3402
#, c-format
msgid "Invalid signature (%s)"
msgstr ""
-#: ../urpm.pm:3439
+#: ../urpm.pm:3429
#, c-format
msgid "Invalid Key ID (%s)"
msgstr ""
-#: ../urpm.pm:3441
+#: ../urpm.pm:3431
#, c-format
msgid "Missing signature (%s)"
msgstr ""
-#: ../urpme:35
+#: ../urpm/args.pm:74 ../urpm/args.pm:80
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr ""
+
+#: ../urpm/args.pm:208
+#, 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"
@@ -830,112 +845,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:46
+#: ../urpmi.removemedia:36 ../urpmi.update:29 ../urpmq:42
#, 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:62
#, 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:63
#, 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:75
#, 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:78
#, c-format
msgid "unknown packages"
msgstr ""
-#: ../urpme:91
+#: ../urpme:78
#, c-format
msgid "unknown package"
msgstr ""
-#: ../urpme:101
+#: ../urpme:88
#, c-format
msgid "removing package %s will break your system"
msgstr ""
-#: ../urpme:103
+#: ../urpme:90
#, c-format
msgid "Nothing to remove"
msgstr ""
-#: ../urpme:107
+#: ../urpme:94
#, c-format
msgid "Checking to remove the following packages"
msgstr ""
-#: ../urpme:114
+#: ../urpme:101
#, c-format
msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
msgstr ""
-#: ../urpme:116 ../urpmi:533 ../urpmi:692
+#: ../urpme:103 ../urpmi:460 ../urpmi:619
#, c-format
msgid " (y/N) "
msgstr ""
-#: ../urpme:119 ../urpmi:735
+#: ../urpme:106 ../urpmi:662
#, c-format
msgid "removing %s"
msgstr ""
-#: ../urpme:123
+#: ../urpme:110
#, 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"
@@ -946,38 +951,38 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpmf:32 ../urpmi:79 ../urpmq:41
+#: ../urpmf:33 ../urpmi:78 ../urpmq:43
#, c-format
msgid " --update - use only update media.\n"
msgstr ""
-#: ../urpmf:33 ../urpmi:80 ../urpmq:42
+#: ../urpmf:34 ../urpmi:79 ../urpmq:44
#, 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:45
#, 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:46
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
msgstr ""
-#: ../urpmf:36 ../urpmq:45
+#: ../urpmf:37 ../urpmq:47
#, 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 "
@@ -985,148 +990,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:72
#, 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:87
#, 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:108
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmi:73
+#: ../urpmi:72
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1137,32 +1142,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:48
#, 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:50
#, 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"
@@ -1170,186 +1175,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:49
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr ""
-#: ../urpmi:94 ../urpmq:56
+#: ../urpmi:93 ../urpmq:58
#, 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:47 ../urpmi.update:30 ../urpmq:66
#, 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:48 ../urpmi.update:31 ../urpmq:67
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr ""
-#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:62
+#: ../urpmi:108 ../urpmi.addmedia:49 ../urpmi.update:32
#, 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:50 ../urpmi.update:33 ../urpmq:68
#, 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:52 ../urpmi.update:35 ../urpmq:70
#, 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:78
#, 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:80
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr ""
-#: ../urpmi:131 ../urpmq:80
+#: ../urpmi:130 ../urpmq:82
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr ""
-#: ../urpmi:132 ../urpmq:81
+#: ../urpmi:131 ../urpmq:83
#, 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"
@@ -1362,22 +1356,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"
@@ -1387,66 +1381,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"
@@ -1454,58 +1448,58 @@ 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)"
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:281
#, 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: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"
@@ -1513,57 +1507,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:37
#, c-format
msgid ""
"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1578,36 +1572,36 @@ msgid ""
"and [options] are from\n"
msgstr ""
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:54
#, c-format
msgid " --update - create an update medium.\n"
msgstr ""
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:55
#, c-format
msgid " --probe-synthesis - try to find and use synthesis file.\n"
msgstr ""
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:56
#, c-format
msgid " --probe-hdlist - try to find and use hdlist file.\n"
msgstr ""
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:57
#, c-format
msgid ""
" --no-probe - do not try to find any synthesis or\n"
" hdlist file.\n"
msgstr ""
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:59
#, c-format
msgid ""
" --distrib - automatically create all media from an installation\n"
" medium.\n"
msgstr ""
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:61
#, c-format
msgid ""
" --distrib-XXX - automatically create a medium for XXX part of a\n"
@@ -1615,14 +1609,14 @@ msgid ""
" anything else that has been configured ;-)\n"
msgstr ""
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:64
#, c-format
msgid ""
" --from - use specified url for list of mirrors, the default is\n"
" %s\n"
msgstr ""
-#: ../urpmi.addmedia:73
+#: ../urpmi.addmedia:66
#, c-format
msgid ""
" --version - use specified distribution version, the default is taken\n"
@@ -1630,79 +1624,66 @@ msgid ""
" installed mandrake-release package.\n"
msgstr ""
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:69
#, c-format
msgid ""
" --arch - use specified architecture, the default is arch of\n"
" mandrake-release package installed.\n"
msgstr ""
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:71
#, 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:73 ../urpmi.update:38
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr ""
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:71
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:38 ../urpmi.update:41
#, c-format
msgid " -c - clean headers cache directory.\n"
msgstr ""
-#: ../urpmi.addmedia:82 ../urpmi.update:72
+#: ../urpmi.addmedia:75 ../urpmi.update:42
#, 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:127
#, c-format
msgid "cannot add updates of a cooker distribution\n"
msgstr ""
-#: ../urpmi.addmedia:157
+#: ../urpmi.addmedia:132
#, c-format
msgid "retrieving mirrors at %s ..."
msgstr ""
-#: ../urpmi.addmedia:193
+#: ../urpmi.addmedia:169
#, 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:176 ../urpmi.addmedia:199
#, c-format
msgid "unable to update medium \"%s\"\n"
msgstr ""
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:187
#, c-format
-msgid ""
-"%s\n"
-"<relative path of hdlist> missing\n"
+msgid "<relative path of hdlist> missing\n"
msgstr ""
-#: ../urpmi.addmedia:213
+#: ../urpmi.addmedia:189
#, c-format
-msgid ""
-"%s\n"
-"`with' missing for network media\n"
+msgid "`with' missing for network media\n"
msgstr ""
-#: ../urpmi.addmedia:221
+#: ../urpmi.addmedia:197
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr ""
@@ -1719,6 +1700,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"
@@ -1731,41 +1719,41 @@ msgid ""
"(one of %s)\n"
msgstr ""
-#: ../urpmi.update:57
+#: ../urpmi.update:27
#, c-format
msgid ""
"usage: urpmi.update [options] <name> ...\n"
"where <name> is a medium name to update.\n"
msgstr ""
-#: ../urpmi.update:67
+#: ../urpmi.update:37
#, c-format
msgid " --update - update only update media.\n"
msgstr ""
-#: ../urpmi.update:69
+#: ../urpmi.update:39
#, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr ""
-#: ../urpmi.update:70
+#: ../urpmi.update:40
#, c-format
msgid " -a - select all non-removable media.\n"
msgstr ""
-#: ../urpmi.update:83
+#: ../urpmi.update:62
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr ""
-#: ../urpmi.update:95
+#: ../urpmi.update:74
#, c-format
msgid ""
"the entry to update is missing\n"
"(one of %s)\n"
msgstr ""
-#: ../urpmq:35
+#: ../urpmq:37
#, c-format
msgid ""
"urpmq version %s\n"
@@ -1776,120 +1764,110 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpmq:50
+#: ../urpmq:52
#, c-format
msgid " --list - list available packages.\n"
msgstr ""
-#: ../urpmq:51
+#: ../urpmq:53
#, c-format
msgid " --list-media - list available media.\n"
msgstr ""
-#: ../urpmq:52
+#: ../urpmq:54
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr ""
-#: ../urpmq:53
+#: ../urpmq:55
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr ""
-#: ../urpmq:54
+#: ../urpmq:56
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr ""
-#: ../urpmq:55
+#: ../urpmq:57
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr ""
-#: ../urpmq:57
+#: ../urpmq:59
#, c-format
msgid ""
" --headers - extract headers for package listed from urpmi db to\n"
" stdout (root only).\n"
msgstr ""
-#: ../urpmq:59
+#: ../urpmq:61
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
msgstr ""
-#: ../urpmq:62
+#: ../urpmq:64
#, 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:74
#, c-format
msgid " --changelog - print changelog.\n"
msgstr ""
-#: ../urpmq:74
+#: ../urpmq:76
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr ""
-#: ../urpmq:75
+#: ../urpmq:77
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
msgstr ""
-#: ../urpmq:77
+#: ../urpmq:79
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr ""
-#: ../urpmq:79
+#: ../urpmq:81
#, c-format
msgid " -R - reverse search to what requires package.\n"
msgstr ""
-#: ../urpmq:82
+#: ../urpmq:84
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
-#: ../urpmq:83
+#: ../urpmq:85
#, c-format
msgid " -g - print groups with name also.\n"
msgstr ""
-#: ../urpmq:84
+#: ../urpmq:86
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr ""
-#: ../urpmq:86
+#: ../urpmq:88
#, c-format
msgid " -l - list files in package.\n"
msgstr ""
-#: ../urpmq:87
+#: ../urpmq:89
#, 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:144
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr ""