summaryrefslogtreecommitdiffstats
path: root/po/urpmi.pot
diff options
context:
space:
mode:
authorFunda Wang <fwang@mandriva.org>2006-01-17 13:04:58 +0000
committerFunda Wang <fwang@mandriva.org>2006-01-17 13:04:58 +0000
commit915d3178663b84832b676d878ed39578fefb0f81 (patch)
treef022fc164c3dfb63913d493e26e50a75de2a69b0 /po/urpmi.pot
parent5e4380f61b7266b6a00a3c130e4873c6a86ed65c (diff)
downloadurpmi-915d3178663b84832b676d878ed39578fefb0f81.tar
urpmi-915d3178663b84832b676d878ed39578fefb0f81.tar.gz
urpmi-915d3178663b84832b676d878ed39578fefb0f81.tar.bz2
urpmi-915d3178663b84832b676d878ed39578fefb0f81.tar.xz
urpmi-915d3178663b84832b676d878ed39578fefb0f81.zip
Updated POT file.
Diffstat (limited to 'po/urpmi.pot')
-rw-r--r--po/urpmi.pot434
1 files changed, 227 insertions, 207 deletions
diff --git a/po/urpmi.pot b/po/urpmi.pot
index 4d5ce65f..b3922373 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: 2005-12-23 21:41+0800\n"
+"POT-Creation-Date: 2006-01-17 20:17+0800\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"
@@ -116,7 +116,7 @@ msgstr ""
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:124 ../urpmi:395
+#: ../gurpmi2:124 ../urpmi:402
msgid "One of the following packages is needed:"
msgstr ""
@@ -144,21 +144,21 @@ msgstr ""
msgid "Package installation..."
msgstr ""
-#: ../gurpmi2:190 ../urpmi:543
+#: ../gurpmi2:190 ../urpmi:556
msgid "unable to get source packages, aborting"
msgstr ""
-#: ../gurpmi2:204 ../urpmi:554
+#: ../gurpmi2:203 ../urpmi:566
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr ""
-#: ../gurpmi2:233
+#: ../gurpmi2:231
#, c-format
msgid "Downloading package `%s'..."
msgstr ""
-#: ../gurpmi2:248
+#: ../gurpmi2:246
#, c-format
msgid ""
"The following packages have bad signatures:\n"
@@ -168,7 +168,7 @@ msgid ""
msgstr ""
#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:255 ../gurpmi2:304 ../urpmi:626 ../urpmi:749
+#: ../gurpmi2:253 ../gurpmi2:302 ../urpmi:638 ../urpmi:764
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -177,34 +177,34 @@ msgid ""
msgstr ""
#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:262 ../urpme:124 ../urpmi:670
+#: ../gurpmi2:260 ../urpme:124 ../urpmi:682
#, c-format
msgid "removing %s"
msgstr ""
-#: ../gurpmi2:270 ../urpm.pm:2921
+#: ../gurpmi2:268 ../urpm.pm:2878
msgid "Preparing..."
msgstr ""
-#: ../gurpmi2:272
+#: ../gurpmi2:270
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr ""
#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:290 ../urpmi:637 ../urpmi:691 ../urpmi:710 ../urpmi:727
+#: ../gurpmi2:288 ../urpmi:649 ../urpmi:703 ../urpmi:723 ../urpmi:741
msgid "Installation failed"
msgstr ""
-#: ../gurpmi2:299
+#: ../gurpmi2:297
msgid "_Done"
msgstr ""
-#: ../gurpmi2:307 ../urpmi:766
+#: ../gurpmi2:305 ../urpmi:781
msgid "The package(s) are already installed"
msgstr ""
-#: ../gurpmi2:309
+#: ../gurpmi2:307
msgid "Installation finished"
msgstr ""
@@ -233,7 +233,7 @@ msgid " defaults is %s.\n"
msgstr ""
#. - need to be root if binary rpms are to be installed
-#: ../rurpmi:11 ../urpmi:236
+#: ../rurpmi:11 ../urpmi:239
msgid "Only superuser is allowed to install packages"
msgstr ""
@@ -266,14 +266,14 @@ msgstr ""
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr ""
-#: ../urpm.pm:229 ../urpm.pm:1322 ../urpm.pm:1332
+#: ../urpm.pm:229 ../urpm.pm:1304 ../urpm.pm:1314
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr ""
#. list file exists but isn't readable
#. report error only if no result found, list files are only readable by root
-#: ../urpm.pm:232 ../urpm.pm:2525
+#: ../urpm.pm:232 ../urpm.pm:2493
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr ""
@@ -401,17 +401,17 @@ msgstr ""
#. - as previously done, just read synthesis file here, this is enough.
#. - read default synthesis (we have to make sure nothing get out of depslist).
#: ../urpm.pm:564 ../urpm.pm:590 ../urpm.pm:1076 ../urpm.pm:1087
-#: ../urpm.pm:1159 ../urpm.pm:1176 ../urpm.pm:1246 ../urpm.pm:1305
-#: ../urpm.pm:1520 ../urpm.pm:1643 ../urpm.pm:1760 ../urpm.pm:1766
-#: ../urpm.pm:1869 ../urpm.pm:1955 ../urpm.pm:1959
+#: ../urpm.pm:1159 ../urpm.pm:1176 ../urpm.pm:1231 ../urpm.pm:1287
+#: ../urpm.pm:1491 ../urpm.pm:1611 ../urpm.pm:1728 ../urpm.pm:1734
+#: ../urpm.pm:1837 ../urpm.pm:1923 ../urpm.pm:1927
#, c-format
msgid "examining synthesis file [%s]"
msgstr ""
#: ../urpm.pm:568 ../urpm.pm:583 ../urpm.pm:596 ../urpm.pm:1079
-#: ../urpm.pm:1090 ../urpm.pm:1165 ../urpm.pm:1171 ../urpm.pm:1251
-#: ../urpm.pm:1309 ../urpm.pm:1524 ../urpm.pm:1647 ../urpm.pm:1754
-#: ../urpm.pm:1772 ../urpm.pm:1965
+#: ../urpm.pm:1090 ../urpm.pm:1165 ../urpm.pm:1171 ../urpm.pm:1236
+#: ../urpm.pm:1291 ../urpm.pm:1495 ../urpm.pm:1615 ../urpm.pm:1722
+#: ../urpm.pm:1740 ../urpm.pm:1933
#, c-format
msgid "examining hdlist file [%s]"
msgstr ""
@@ -427,13 +427,13 @@ msgid "Search start: %s end: %s"
msgstr ""
#. - this is almost a fatal error, ignore it by default?
-#: ../urpm.pm:613 ../urpm.pm:1097 ../urpm.pm:1184 ../urpm.pm:1255
-#: ../urpm.pm:1651
+#: ../urpm.pm:613 ../urpm.pm:1097 ../urpm.pm:1184 ../urpm.pm:1240
+#: ../urpm.pm:1619
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr ""
-#: ../urpm.pm:620 ../urpm.pm:1907
+#: ../urpm.pm:620 ../urpm.pm:1875
msgid "performing second pass to compute dependencies\n"
msgstr ""
@@ -449,8 +449,8 @@ msgstr ""
#. - beware this can be a child process or the main process now...
#. - open in read/write mode unless testing installation.
-#: ../urpm.pm:660 ../urpm.pm:2331 ../urpm.pm:2392 ../urpm.pm:2582
-#: ../urpm.pm:2986 ../urpm.pm:3110
+#: ../urpm.pm:660 ../urpm.pm:2299 ../urpm.pm:2360 ../urpm.pm:2550
+#: ../urpm.pm:2943 ../urpm.pm:3067
msgid "unable to open rpmdb"
msgstr ""
@@ -476,12 +476,12 @@ msgstr ""
msgid "copying hdlists file..."
msgstr ""
-#: ../urpm.pm:783 ../urpm.pm:1200 ../urpm.pm:1275
+#: ../urpm.pm:783 ../urpm.pm:1200 ../urpm.pm:1257
msgid "...copying done"
msgstr ""
-#: ../urpm.pm:784 ../urpm.pm:1201 ../urpm.pm:1350 ../urpm.pm:1409
-#: ../urpm.pm:1589 ../urpm.pm:1596
+#: ../urpm.pm:784 ../urpm.pm:1201 ../urpm.pm:1332 ../urpm.pm:1395
+#: ../urpm.pm:1557 ../urpm.pm:1564
msgid "...copying failed"
msgstr ""
@@ -493,11 +493,11 @@ msgstr ""
msgid "retrieving hdlists file..."
msgstr ""
-#: ../urpm.pm:806 ../urpm.pm:1633 ../urpm.pm:2131 ../urpm.pm:2851
+#: ../urpm.pm:806 ../urpm.pm:1601 ../urpm.pm:2099 ../urpm.pm:2808
msgid "...retrieving done"
msgstr ""
-#: ../urpm.pm:808 ../urpm.pm:1617 ../urpm.pm:2135 ../urpm.pm:2853
+#: ../urpm.pm:808 ../urpm.pm:1585 ../urpm.pm:2103 ../urpm.pm:2810
#, c-format
msgid "...retrieving failed: %s"
msgstr ""
@@ -556,380 +556,380 @@ msgstr ""
msgid "copying description file of \"%s\"..."
msgstr ""
-#: ../urpm.pm:1222 ../urpm.pm:1496
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr ""
-
-#: ../urpm.pm:1271
+#: ../urpm.pm:1253
#, c-format
msgid "copying source hdlist (or synthesis) of \"%s\"..."
msgstr ""
-#: ../urpm.pm:1285
+#: ../urpm.pm:1267
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr ""
-#: ../urpm.pm:1290
+#: ../urpm.pm:1272
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr ""
-#: ../urpm.pm:1292
+#: ../urpm.pm:1274
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr ""
-#: ../urpm.pm:1313 ../urpm.pm:1528 ../urpm.pm:1872
+#: ../urpm.pm:1295 ../urpm.pm:1499 ../urpm.pm:1840
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr ""
-#: ../urpm.pm:1367
+#: ../urpm.pm:1353
#, c-format
msgid "reading rpm files from [%s]"
msgstr ""
-#: ../urpm.pm:1382
+#: ../urpm.pm:1368
msgid "no rpms read"
msgstr ""
-#: ../urpm.pm:1392
+#: ../urpm.pm:1378
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr ""
-#: ../urpm.pm:1397
+#: ../urpm.pm:1383
#, c-format
msgid "no rpm files found from [%s]"
msgstr ""
#. - try to probe for possible with_hdlist parameter, unless
#. - it is already defined (and valid).
-#: ../urpm.pm:1546
+#: ../urpm.pm:1514
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr ""
-#: ../urpm.pm:1574
+#: ../urpm.pm:1542
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr ""
-#: ../urpm.pm:1624
+#: ../urpm.pm:1592
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr ""
-#: ../urpm.pm:1626
+#: ../urpm.pm:1594
msgid "...retrieving failed: md5sum mismatch"
msgstr ""
-#: ../urpm.pm:1724
+#: ../urpm.pm:1692
msgid "retrieval of source hdlist (or synthesis) failed"
msgstr ""
-#: ../urpm.pm:1731
+#: ../urpm.pm:1699
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr ""
-#: ../urpm.pm:1742 ../urpm.pm:1796
+#: ../urpm.pm:1710 ../urpm.pm:1764
#, c-format
msgid "file [%s] already used in the same medium \"%s\""
msgstr ""
-#: ../urpm.pm:1782
+#: ../urpm.pm:1750
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr ""
-#: ../urpm.pm:1821
+#: ../urpm.pm:1789
#, c-format
msgid "unable to write list file of \"%s\""
msgstr ""
-#: ../urpm.pm:1829
+#: ../urpm.pm:1797
#, c-format
msgid "writing list file for medium \"%s\""
msgstr ""
-#: ../urpm.pm:1831
+#: ../urpm.pm:1799
#, c-format
msgid "nothing written in list file for \"%s\""
msgstr ""
-#: ../urpm.pm:1846
+#: ../urpm.pm:1814
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr ""
-#: ../urpm.pm:1853
+#: ../urpm.pm:1821
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr ""
-#: ../urpm.pm:1856
+#: ../urpm.pm:1824
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr ""
-#: ../urpm.pm:1921
+#: ../urpm.pm:1889
#, c-format
msgid "reading headers from medium \"%s\""
msgstr ""
-#: ../urpm.pm:1926
+#: ../urpm.pm:1894
#, c-format
msgid "building hdlist [%s]"
msgstr ""
#. - XXX this happens when building a synthesis for a local media from RPMs... why ?
-#: ../urpm.pm:1941 ../urpm.pm:1977
+#: ../urpm.pm:1909 ../urpm.pm:1945
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr ""
-#: ../urpm.pm:1945 ../urpm.pm:1981 ../urpmi:352
+#: ../urpm.pm:1913 ../urpm.pm:1949 ../urpmi:359
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr ""
-#: ../urpm.pm:2004
+#: ../urpm.pm:1972
#, c-format
msgid "found %d headers in cache"
msgstr ""
-#: ../urpm.pm:2008
+#: ../urpm.pm:1976
#, c-format
msgid "removing %d obsolete headers in cache"
msgstr ""
-#: ../urpm.pm:2029
+#: ../urpm.pm:1997
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm.pm:2034
+#: ../urpm.pm:2002
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm.pm:2070
+#: ../urpm.pm:2038
#, c-format
msgid "mounting %s"
msgstr ""
-#: ../urpm.pm:2092
+#: ../urpm.pm:2060
#, c-format
msgid "unmounting %s"
msgstr ""
-#: ../urpm.pm:2116
+#: ../urpm.pm:2084
#, c-format
msgid "invalid rpm file name [%s]"
msgstr ""
-#: ../urpm.pm:2122
+#: ../urpm.pm:2090
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr ""
-#: ../urpm.pm:2140
+#: ../urpm.pm:2108
#, c-format
msgid "unable to access rpm file [%s]"
msgstr ""
-#: ../urpm.pm:2145
+#: ../urpm.pm:2113
msgid "unable to register rpm file"
msgstr ""
-#: ../urpm.pm:2148
+#: ../urpm.pm:2116
msgid "error registering local packages"
msgstr ""
-#: ../urpm.pm:2172
+#: ../urpm.pm:2140
msgid "Search"
msgstr ""
-#: ../urpm.pm:2259
+#: ../urpm.pm:2227
#, c-format
msgid "no package named %s"
msgstr ""
#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpm.pm:2261 ../urpme:97
+#: ../urpm.pm:2229 ../urpme:97
#, c-format
msgid "The following packages contain %s: %s"
msgstr ""
-#: ../urpm.pm:2455 ../urpm.pm:2502 ../urpm.pm:2533
+#: ../urpm.pm:2423 ../urpm.pm:2470 ../urpm.pm:2501
#, c-format
msgid "there are multiple packages with the same rpm filename \"%s\""
msgstr ""
-#: ../urpm.pm:2516
+#: ../urpm.pm:2484
#, c-format
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr ""
-#: ../urpm.pm:2549
+#: ../urpm.pm:2517
#, 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:2553
+#: ../urpm.pm:2521
#, c-format
msgid "medium \"%s\" does not define any location for rpm files"
msgstr ""
-#: ../urpm.pm:2565
+#: ../urpm.pm:2533
#, c-format
msgid "package %s is not found."
msgstr ""
-#: ../urpm.pm:2623 ../urpm.pm:2637 ../urpm.pm:2657 ../urpm.pm:2671
+#: ../urpm.pm:2584 ../urpm.pm:2598 ../urpm.pm:2618 ../urpm.pm:2632
msgid "urpmi database locked"
msgstr ""
-#: ../urpm.pm:2723 ../urpm.pm:2728 ../urpm.pm:2754
+#: ../urpm.pm:2684 ../urpm.pm:2689 ../urpm.pm:2715
#, c-format
msgid "medium \"%s\" is not selected"
msgstr ""
#. - fallback to use other method for retrieving the file later.
-#: ../urpm.pm:2750
+#: ../urpm.pm:2711
#, c-format
msgid "unable to read rpm file [%s] from medium \"%s\""
msgstr ""
#. - we have a removable device that is not removable, well...
-#: ../urpm.pm:2758
+#: ../urpm.pm:2719
#, c-format
msgid "inconsistent medium \"%s\" marked removable but not really"
msgstr ""
-#: ../urpm.pm:2770
+#: ../urpm.pm:2731
#, c-format
msgid "unable to access medium \"%s\""
msgstr ""
-#: ../urpm.pm:2829
+#: ../urpm.pm:2786
#, c-format
-msgid "malformed input: [%s]"
+msgid "malformed URL: [%s]"
msgstr ""
-#: ../urpm.pm:2836
+#: ../urpm.pm:2793
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr ""
-#: ../urpm.pm:2959
+#: ../urpm.pm:2916
#, c-format
msgid "using process %d for executing transaction"
msgstr ""
-#: ../urpm.pm:2990
+#: ../urpm.pm:2947
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
-#: ../urpm.pm:2993
+#: ../urpm.pm:2950
msgid "unable to create transaction"
msgstr ""
-#: ../urpm.pm:3001
+#: ../urpm.pm:2958
#, c-format
msgid "removing package %s"
msgstr ""
-#: ../urpm.pm:3003
+#: ../urpm.pm:2960
#, c-format
msgid "unable to remove package %s"
msgstr ""
-#: ../urpm.pm:3015
+#: ../urpm.pm:2972
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr ""
-#: ../urpm.pm:3021
+#: ../urpm.pm:2978
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr ""
-#: ../urpm.pm:3024
+#: ../urpm.pm:2981
#, c-format
msgid "unable to install package %s"
msgstr ""
-#: ../urpm.pm:3081
+#: ../urpm.pm:3038
#, c-format
msgid "More information on package %s"
msgstr ""
-#: ../urpm.pm:3252 ../urpm.pm:3285
+#: ../urpm.pm:3209 ../urpm.pm:3242
#, c-format
msgid "due to missing %s"
msgstr ""
-#: ../urpm.pm:3253 ../urpm.pm:3283
+#: ../urpm.pm:3210 ../urpm.pm:3240
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpm.pm:3254
+#: ../urpm.pm:3211
#, c-format
msgid "trying to promote %s"
msgstr ""
-#: ../urpm.pm:3255
+#: ../urpm.pm:3212
#, c-format
msgid "in order to keep %s"
msgstr ""
-#: ../urpm.pm:3278
+#: ../urpm.pm:3235
#, c-format
msgid "in order to install %s"
msgstr ""
-#: ../urpm.pm:3289
+#: ../urpm.pm:3246
#, c-format
msgid "due to conflicts with %s"
msgstr ""
-#: ../urpm.pm:3290
+#: ../urpm.pm:3247
msgid "unrequested"
msgstr ""
-#: ../urpm.pm:3306
+#: ../urpm.pm:3265
#, c-format
msgid "Invalid signature (%s)"
msgstr ""
-#: ../urpm.pm:3338
+#: ../urpm.pm:3298
#, c-format
msgid "Invalid Key ID (%s)"
msgstr ""
-#: ../urpm.pm:3340
+#: ../urpm.pm:3300
#, c-format
msgid "Missing signature (%s)"
msgstr ""
-#: ../urpm.pm:3400
+#: ../urpm.pm:3359
msgid "examining MD5SUM file"
msgstr ""
-#: ../urpm.pm:3411
+#: ../urpm.pm:3369
#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr ""
-#: ../urpm.pm:3433
+#: ../urpm.pm:3380
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr ""
+
+#: ../urpm.pm:3410
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
@@ -947,14 +947,14 @@ msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr ""
#. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../urpm/msg.pm:46 ../urpme:33 ../urpmi:432 ../urpmi:450 ../urpmi:485
-#: ../urpmi:532 ../urpmi:616 ../urpmi:696
+#: ../urpm/msg.pm:46 ../urpme:33 ../urpmi:439 ../urpmi:457 ../urpmi:495
+#: ../urpmi:545 ../urpmi:628 ../urpmi:709
msgid "Nn"
msgstr ""
#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:47 ../urpme:35 ../urpmi:433 ../urpmi:451 ../urpmi:486
-#: ../urpmi:533 ../urpmi:617 ../urpmi:697
+#: ../urpm/msg.pm:47 ../urpme:35 ../urpmi:440 ../urpmi:458 ../urpmi:496
+#: ../urpmi:546 ../urpmi:629 ../urpmi:710
msgid "Yy"
msgstr ""
@@ -1006,7 +1006,7 @@ msgid "Installation failed on node %s"
msgstr ""
#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpm/parallel_ka_run.pm:239 ../urpm/parallel_ssh.pm:254 ../urpmi:763
+#: ../urpm/parallel_ka_run.pm:239 ../urpm/parallel_ssh.pm:254 ../urpmi:778
msgid "Installation is possible"
msgstr ""
@@ -1081,7 +1081,7 @@ msgstr ""
msgid " --help - print this help message.\n"
msgstr ""
-#: ../urpme:44 ../urpmi:87
+#: ../urpme:44
msgid " --auto - automatically select a package in choices.\n"
msgstr ""
@@ -1112,7 +1112,7 @@ msgid ""
" to (un)install a chroot with --root option.\n"
msgstr ""
-#: ../urpme:52 ../urpmi:144 ../urpmi.addmedia:75 ../urpmi.removemedia:55
+#: ../urpme:52 ../urpmi:143 ../urpmi.addmedia:70 ../urpmi.removemedia:55
#: ../urpmi.update:49 ../urpmq:90
msgid " -v - verbose mode.\n"
msgstr ""
@@ -1135,7 +1135,7 @@ msgid "unknown packages"
msgstr ""
#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:103 ../urpmi:468
+#: ../urpme:103 ../urpmi:475
#, c-format
msgid "removing package %s will break your system"
msgstr ""
@@ -1155,7 +1155,7 @@ msgid ""
"To satisfy dependencies, the following %d packages will be removed (%d MB)"
msgstr ""
-#: ../urpme:120 ../urpmi:487 ../urpmi:618
+#: ../urpme:120 ../urpmi:497 ../urpmi:630
msgid " (y/N) "
msgstr ""
@@ -1183,7 +1183,7 @@ msgstr ""
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
-#: ../urpmf:37 ../urpmi:84 ../urpmq:48
+#: ../urpmf:37 ../urpmi:82 ../urpmq:48
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
@@ -1192,7 +1192,7 @@ msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
-#: ../urpmf:39 ../urpmi:82 ../urpmq:46
+#: ../urpmf:39 ../urpmi:81 ../urpmq:46
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
@@ -1209,7 +1209,7 @@ msgstr ""
msgid " --uniq - do not print identical lines twice.\n"
msgstr ""
-#: ../urpmf:43 ../urpmi:81 ../urpmq:45
+#: ../urpmf:43 ../urpmi:83 ../urpmq:45
msgid " --update - use only update media.\n"
msgstr ""
@@ -1362,7 +1362,7 @@ msgstr ""
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:173 ../urpmi:225 ../urpmq:115
+#: ../urpmf:173 ../urpmi:228 ../urpmq:115
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
@@ -1388,10 +1388,15 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpmi:83 ../urpmq:47
+#: ../urpmi:84
msgid ""
-" --searchmedia - use only the given media to search requested (or updated) "
-"packages.\n"
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+
+#: ../urpmi:87
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions.\n"
msgstr ""
#: ../urpmi:88 ../urpmq:51
@@ -1428,12 +1433,12 @@ msgstr ""
msgid " --split-length - small transaction length, default is %d.\n"
msgstr ""
-#: ../urpmi:97 ../urpmq:52
-msgid " --fuzzy - impose fuzzy search (same as -y).\n"
+#: ../urpmi:97
+msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr ""
-#: ../urpmi:98 ../urpmq:61
-msgid " --src - next package is a source package (same as -s).\n"
+#: ../urpmi:98
+msgid " --src, -s - next package is a source package.\n"
msgstr ""
#: ../urpmi:99
@@ -1521,12 +1526,13 @@ msgstr ""
#: ../urpmi:126
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disable it, default is enabled).\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
msgstr ""
#: ../urpmi:128
msgid ""
-" --test - verify if the installation can be achieved correctly.\n"
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
msgstr ""
#: ../urpmi:129
@@ -1551,80 +1557,77 @@ msgid ""
" than the default.\n"
msgstr ""
-#: ../urpmi:136 ../urpmi.addmedia:69 ../urpmi.update:42
+#: ../urpmi:136 ../urpmi.addmedia:64 ../urpmi.update:42
msgid " --norebuild - don't try to rebuild hdlist if not readable.\n"
msgstr ""
#: ../urpmi:137
+msgid " --nolock - don't lock rpm db.\n"
+msgstr ""
+
+#: ../urpmi:138
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:138 ../urpmq:76
+#: ../urpmi:139 ../urpmq:76
msgid " -a - select all matches on command line.\n"
msgstr ""
-#: ../urpmi:139
+#: ../urpmi:140
msgid " -p - allow search in provides to find package.\n"
msgstr ""
-#: ../urpmi:140
+#: ../urpmi:141
msgid " -P - do not search in provides to find package.\n"
msgstr ""
-#: ../urpmi:141 ../urpmq:91
-msgid " -y - impose fuzzy search (same as --fuzzy).\n"
-msgstr ""
-
-#: ../urpmi:142 ../urpmq:88
-msgid " -s - next package is a source package (same as --src).\n"
-msgstr ""
-
-#: ../urpmi:143 ../urpmi.addmedia:74 ../urpmi.removemedia:54
+#: ../urpmi:142 ../urpmi.addmedia:69 ../urpmi.removemedia:54
#: ../urpmi.update:48
msgid " -q - quiet mode.\n"
msgstr ""
-#: ../urpmi:145
+#: ../urpmi:144
msgid " names or rpm files given on command line will be installed.\n"
msgstr ""
-#: ../urpmi:194
-msgid "What can be done with binary rpm files when using --install-src"
+#: ../urpmi:195
+msgid "You can't install binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi:215
+#: ../urpmi:218
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
"or delete it"
msgstr ""
-#: ../urpmi:216
+#: ../urpmi:219
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr ""
-#: ../urpmi:219 ../urpmi:362
+#: ../urpmi:222 ../urpmi:369
msgid "Copying failed"
msgstr ""
-#: ../urpmi:245
+#: ../urpmi:248
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:314
+#. - For translators : there are several media here
+#: ../urpmi:321
msgid "Updating media..."
msgstr ""
-#: ../urpmi:397
+#: ../urpmi:404
#, c-format
msgid "What is your choice? (1-%d) "
msgstr ""
-#: ../urpmi:427
+#: ../urpmi:434
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -1632,24 +1635,24 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:435 ../urpmi:453
+#: ../urpmi:442 ../urpmi:460
msgid ""
"\n"
"Continue installation anyway?"
msgstr ""
-#: ../urpmi:435 ../urpmi:453 ../urpmi:534
+#: ../urpmi:442 ../urpmi:460 ../urpmi:547
msgid " (Y/n) "
msgstr ""
-#: ../urpmi:446
+#: ../urpmi:453
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
"%s"
msgstr ""
-#: ../urpmi:476
+#: ../urpmi:483
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -1657,94 +1660,102 @@ msgid ""
"%s\n"
msgstr ""
-#: ../urpmi:481
+#: ../urpmi:488
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
"%s"
msgstr ""
-#: ../urpmi:516 ../urpmi:528
+#: ../urpmi:490
+msgid "(test only, removal will not be actually done)"
+msgstr ""
+
+#: ../urpmi:526 ../urpmi:538
msgid ""
"To satisfy dependencies, the following packages are going to be installed"
msgstr ""
-#: ../urpmi:517 ../urpmi:529
+#: ../urpmi:527 ../urpmi:539
msgid "To satisfy dependencies, the following package is going to be installed"
msgstr ""
-#: ../urpmi:518
+#: ../urpmi:528
#, c-format
msgid "(%d packages, %d MB)"
msgstr ""
-#: ../urpmi:524
+#: ../urpmi:534
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
"%s\n"
msgstr ""
-#: ../urpmi:530
+#: ../urpmi:541
+msgid "(test only, installation will not be actually done)"
+msgstr ""
+
+#: ../urpmi:543
#, c-format
msgid "Proceed with the installation of the %d packages? (%d MB)"
msgstr ""
-#: ../urpmi:555
+#: ../urpmi:567
msgid "Press Enter when ready..."
msgstr ""
-#: ../urpmi:561
+#: ../urpmi:573
msgid "Cancel"
msgstr ""
-#: ../urpmi:561
+#: ../urpmi:573
msgid "Ok"
msgstr ""
-#: ../urpmi:609
+#: ../urpmi:620
msgid "The following packages have bad signatures"
msgstr ""
-#: ../urpmi:610
+#: ../urpmi:621
msgid "Do you want to continue installation ?"
msgstr ""
-#: ../urpmi:654
+#: ../urpmi:666
#, c-format
msgid "distributing %s"
msgstr ""
#. - there's a common prefix, simplify message
-#: ../urpmi:665
+#: ../urpmi:677
#, c-format
msgid "installing %s from %s"
msgstr ""
-#: ../urpmi:667
+#: ../urpmi:679
#, c-format
msgid "installing %s"
msgstr ""
-#: ../urpmi:698
+#: ../urpmi:711
msgid "Try installation without checking dependencies? (y/N) "
msgstr ""
-#: ../urpmi:715
+#: ../urpmi:729
msgid "Try harder to install (--force)? (y/N) "
msgstr ""
-#: ../urpmi:754
+#: ../urpmi:769
#, c-format
msgid "%d installation transactions failed"
msgstr ""
-#: ../urpmi:770
+#: ../urpmi:785
#, c-format
msgid "The following package names were assumed: %s"
msgstr ""
-#: ../urpmi:787
+#: ../urpmi:802
msgid "restarting urpmi"
msgstr ""
@@ -1799,75 +1810,62 @@ msgstr ""
#: ../urpmi.addmedia:61
msgid ""
-" --version - use specified distribution version, the default is taken\n"
-" from the version of the distribution told by the\n"
-" installed mandriva-release package.\n"
-msgstr ""
-
-#: ../urpmi.addmedia:64
-msgid ""
-" --arch - use specified architecture, the default is arch of\n"
-" mandriva-release package installed.\n"
-msgstr ""
-
-#: ../urpmi.addmedia:66
-msgid ""
" --virtual - create virtual media wich are always up-to-date,\n"
" only file:// protocol is allowed.\n"
msgstr ""
-#: ../urpmi.addmedia:68 ../urpmi.update:40
+#: ../urpmi.addmedia:63 ../urpmi.update:40
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr ""
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:65
msgid " --nopubkey - don't import pubkey of added media\n"
msgstr ""
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:66
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:72 ../urpmi.removemedia:52 ../urpmi.update:46
+#: ../urpmi.addmedia:67 ../urpmi.removemedia:52 ../urpmi.update:46
msgid " -c - clean headers cache directory.\n"
msgstr ""
-#: ../urpmi.addmedia:73 ../urpmi.update:47
+#: ../urpmi.addmedia:68 ../urpmi.update:47
msgid " -f - force generation of hdlist files.\n"
msgstr ""
-#: ../urpmi.addmedia:85
+#: ../urpmi.addmedia:80
#, c-format
msgid "unable to update medium \"%s\"\n"
msgstr ""
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:113
msgid "Only superuser is allowed to add media"
msgstr ""
-#: ../urpmi.addmedia:121
+#: ../urpmi.addmedia:116
#, c-format
msgid "Will create config file [%s]"
msgstr ""
-#: ../urpmi.addmedia:122
+#: ../urpmi.addmedia:117
#, c-format
msgid "Can't create config file [%s]"
msgstr ""
-#: ../urpmi.addmedia:129
+#: ../urpmi.addmedia:124
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr ""
-#: ../urpmi.addmedia:139
+#: ../urpmi.addmedia:134
msgid "<relative path of hdlist> missing\n"
msgstr ""
-#: ../urpmi.addmedia:141
+#: ../urpmi.addmedia:136
msgid "`with' missing for network media\n"
msgstr ""
-#: ../urpmi.addmedia:158
+#: ../urpmi.addmedia:153
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr ""
@@ -1975,6 +1973,16 @@ msgid ""
"usage:\n"
msgstr ""
+#: ../urpmq:47
+msgid ""
+" --searchmedia - use only the given media to search requested (or updated) "
+"packages.\n"
+msgstr ""
+
+#: ../urpmq:52
+msgid " --fuzzy - impose fuzzy search (same as -y).\n"
+msgstr ""
+
#: ../urpmq:55
msgid " --list - list available packages.\n"
msgstr ""
@@ -2000,6 +2008,10 @@ msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr ""
+#: ../urpmq:61
+msgid " --src - next package is a source package (same as -s).\n"
+msgstr ""
+
#: ../urpmq:62
msgid ""
" --sources - give all source packages before downloading (root only).\n"
@@ -2061,12 +2073,20 @@ msgid ""
" -RR - extended reverse search (includes virtual packages).\n"
msgstr ""
+#: ../urpmq:88
+msgid " -s - next package is a source package (same as --src).\n"
+msgstr ""
+
#: ../urpmq:89
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
msgstr ""
+#: ../urpmq:91
+msgid " -y - impose fuzzy search (same as --fuzzy).\n"
+msgstr ""
+
#: ../urpmq:92
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""