summaryrefslogtreecommitdiffstats
path: root/po/urpmi.pot
diff options
context:
space:
mode:
authorFunda Wang <fwang@mandriva.org>2007-08-22 07:57:55 +0000
committerFunda Wang <fwang@mandriva.org>2007-08-22 07:57:55 +0000
commit689f291390d2990f0cdfcd75c9fa91ee93f55ae3 (patch)
treee295e4359f0b0b2b95b910d694e018e435bc2466 /po/urpmi.pot
parentce4c5e8aeb89338badf46c4498a5b023e2d9dc56 (diff)
downloadurpmi-689f291390d2990f0cdfcd75c9fa91ee93f55ae3.tar
urpmi-689f291390d2990f0cdfcd75c9fa91ee93f55ae3.tar.gz
urpmi-689f291390d2990f0cdfcd75c9fa91ee93f55ae3.tar.bz2
urpmi-689f291390d2990f0cdfcd75c9fa91ee93f55ae3.tar.xz
urpmi-689f291390d2990f0cdfcd75c9fa91ee93f55ae3.zip
Updated POT file
Diffstat (limited to 'po/urpmi.pot')
-rw-r--r--po/urpmi.pot852
1 files changed, 456 insertions, 396 deletions
diff --git a/po/urpmi.pot b/po/urpmi.pot
index 8774b863..f57578a8 100644
--- a/po/urpmi.pot
+++ b/po/urpmi.pot
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+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"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr ""
@@ -24,7 +24,7 @@ msgstr ""
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
#, c-format
msgid "_Ok"
msgstr ""
@@ -72,7 +72,7 @@ msgstr ""
msgid "_Save"
msgstr ""
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
#, c-format
msgid "_Cancel"
msgstr ""
@@ -92,17 +92,17 @@ msgstr ""
msgid "No packages specified"
msgstr ""
-#: ../gurpmi2:44
+#: ../gurpmi2:45
#, c-format
msgid "Please wait..."
msgstr ""
-#: ../gurpmi2:53
+#: ../gurpmi2:54
#, c-format
msgid "Must be root"
msgstr ""
-#: ../gurpmi2:88
+#: ../gurpmi2:89
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -110,42 +110,42 @@ msgid ""
"Continue installation anyway?"
msgstr ""
-#: ../gurpmi2:112
+#: ../gurpmi2:113
#, c-format
msgid "Warning"
msgstr ""
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
#, c-format
msgid "Ok"
msgstr ""
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to upgrade)"
msgstr ""
-#: ../gurpmi2:150
+#: ../gurpmi2:151
#, c-format
msgid " (to install)"
msgstr ""
-#: ../gurpmi2:153
+#: ../gurpmi2:154
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:154
+#: ../gurpmi2:155
#, c-format
msgid "One of the following packages is needed:"
msgstr ""
-#: ../gurpmi2:177
+#: ../gurpmi2:178
#, c-format
msgid "_Abort"
msgstr ""
-#: ../gurpmi2:197
+#: ../gurpmi2:198
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -153,97 +153,89 @@ msgid ""
"Continue installation anyway?"
msgstr ""
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr ""
-#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr ""
-#: ../gurpmi2:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] ""
msgstr[1] ""
-#: ../gurpmi2:225
+#: ../gurpmi2:226
#, c-format
msgid "Package installation..."
msgstr ""
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
#, c-format
msgid "unable to get source packages, aborting"
msgstr ""
-#: ../gurpmi2:239 ../urpmi:622
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr ""
-
-#: ../gurpmi2:264
-#, c-format
-msgid "Downloading package `%s'..."
-msgstr ""
-
-#: ../gurpmi2:279
+#: ../gurpmi2:242 ../urpm/install.pm:70
#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
+msgid "Preparing..."
msgstr ""
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:246
#, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
+msgid "Installing package `%s' (%s/%s)..."
msgstr ""
-#: ../gurpmi2:292 ../urpme:142
+#: ../gurpmi2:262 ../urpmi:631
#, c-format
-msgid "removing %s"
+msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr ""
-#: ../gurpmi2:298 ../urpm/install.pm:70
+#: ../gurpmi2:273
#, c-format
-msgid "Preparing..."
+msgid "Downloading package `%s'..."
msgstr ""
-#: ../gurpmi2:302
+#: ../gurpmi2:291
#, c-format
-msgid "Installing package `%s' (%s/%s)..."
+msgid "_Done"
msgstr ""
-#: ../gurpmi2:334
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
#, c-format
-msgid "_Done"
+msgid ""
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
msgstr ""
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
#, c-format
msgid "Installation failed:"
msgstr ""
-#: ../gurpmi2:344
+#: ../gurpmi2:309
#, c-format
msgid "The package(s) are already installed"
msgstr ""
-#: ../gurpmi2:346
+#: ../gurpmi2:311
#, c-format
msgid "Installation finished"
msgstr ""
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr ""
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -276,7 +268,7 @@ msgstr ""
msgid " defaults to %s.\n"
msgstr ""
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr ""
@@ -286,98 +278,98 @@ msgstr ""
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:91
+#: ../urpm.pm:104
#, c-format
msgid "unable to open rpmdb"
msgstr ""
-#: ../urpm.pm:110
+#: ../urpm.pm:123
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:126
+#: ../urpm.pm:139
#, c-format
msgid "invalid rpm file name [%s]"
msgstr ""
-#: ../urpm.pm:132
+#: ../urpm.pm:145
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr ""
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
#, c-format
msgid "...retrieving done"
msgstr ""
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
#, c-format
msgid "...retrieving failed: %s"
msgstr ""
-#: ../urpm.pm:142
+#: ../urpm.pm:155
#, c-format
msgid "unable to access rpm file [%s]"
msgstr ""
-#: ../urpm.pm:147
+#: ../urpm.pm:160
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr ""
-#: ../urpm.pm:157
+#: ../urpm.pm:170
#, c-format
msgid "unable to register rpm file"
msgstr ""
-#: ../urpm.pm:159
+#: ../urpm.pm:172
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:163
+#: ../urpm.pm:176
#, c-format
msgid "error registering local packages"
msgstr ""
-#: ../urpm.pm:259
+#: ../urpm.pm:274
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr ""
-#: ../urpm/args.pm:135
+#: ../urpm/args.pm:263
#, c-format
-msgid "chroot directory doesn't exist"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr ""
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:407
#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:424
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:424
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr ""
@@ -564,7 +556,12 @@ msgstr ""
msgid "malformed URL: [%s]"
msgstr ""
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr ""
@@ -574,43 +571,48 @@ msgstr ""
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
-#: ../urpm/install.pm:115
+#: ../urpm/install.pm:146
#, c-format
msgid "unable to create transaction"
msgstr ""
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr ""
-#: ../urpm/install.pm:139
+#: ../urpm/install.pm:170
#, c-format
msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
msgstr ""
-#: ../urpm/install.pm:142
+#: ../urpm/install.pm:173
#, c-format
msgid "unable to install package %s"
msgstr ""
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, c-format
+msgid "Removing package %s"
+msgstr ""
+
+#: ../urpm/install.pm:211
#, c-format
msgid "removing package %s"
msgstr ""
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr ""
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
#, c-format
msgid "More information on package %s"
msgstr ""
@@ -640,11 +642,103 @@ msgstr ""
msgid "Cannot connect to ldap uri:"
msgstr ""
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, c-format
+msgid "%s database locked. waiting..."
+msgstr ""
+
+#: ../urpm/lock.pm:63
+#, c-format
+msgid "aborting"
+msgstr ""
+
+#: ../urpm/lock.pm:65
#, c-format
msgid "%s database locked"
msgstr ""
+#: ../urpm/main_loop.pm:99
+#, c-format
+msgid "The following package has bad signature"
+msgstr ""
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr ""
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr ""
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr ""
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr ""
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr ""
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr ""
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr ""
+
+#: ../urpm/main_loop.pm:205
+#, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr ""
+
+#: ../urpm/main_loop.pm:247
+#, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr ""
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr ""
+
+#: ../urpm/main_loop.pm:271
+#, c-format
+msgid "Package %s is already installed"
+msgstr ""
+
+#: ../urpm/main_loop.pm:272
+#, c-format
+msgid "Packages %s are already installed"
+msgstr ""
+
+#: ../urpm/main_loop.pm:275
+#, c-format
+msgid "Package %s can not be installed"
+msgstr ""
+
+#: ../urpm/main_loop.pm:276
+#, c-format
+msgid "Packages %s can not be installed"
+msgstr ""
+
#: ../urpm/md5sum.pm:23
#, c-format
msgid "examining %s file"
@@ -692,7 +786,7 @@ msgstr ""
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr ""
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr ""
@@ -779,7 +873,7 @@ msgstr ""
msgid "Search start: %s end: %s"
msgstr ""
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr ""
@@ -844,144 +938,149 @@ msgstr ""
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr ""
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
#, c-format
msgid "selecting multiple media: %s"
msgstr ""
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
#, c-format
msgid "removing medium \"%s\""
msgstr ""
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr ""
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
#, c-format
msgid "...reconfiguration failed"
msgstr ""
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
#, c-format
msgid "reconfiguration done"
msgstr ""
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr ""
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
#, c-format
msgid "examining hdlist file [%s]"
msgstr ""
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
#, c-format
msgid "examining synthesis file [%s]"
msgstr ""
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
#, c-format
msgid "building hdlist [%s]"
msgstr ""
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr ""
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr ""
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr ""
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
#, c-format
msgid "...copying failed"
msgstr ""
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
#, c-format
msgid "copying description file of \"%s\"..."
msgstr ""
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
#, c-format
msgid "...copying done"
msgstr ""
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr ""
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr ""
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr ""
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr ""
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr ""
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
#, c-format
msgid "no rpm files found from [%s]"
msgstr ""
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
#, c-format
msgid "reading rpm files from [%s]"
msgstr ""
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr ""
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
#, c-format
msgid "no rpms read"
msgstr ""
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -989,74 +1088,74 @@ msgid ""
"medium."
msgstr ""
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr ""
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr ""
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr ""
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr ""
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr ""
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr ""
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr ""
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
#, c-format
msgid "writing list file for medium \"%s\""
msgstr ""
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
#, c-format
msgid "updated medium \"%s\""
msgstr ""
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr ""
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr ""
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
#, c-format
msgid "reading headers from medium \"%s\""
msgstr ""
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
#, c-format
msgid "Nn"
msgstr ""
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr ""
@@ -1116,47 +1215,52 @@ msgstr ""
msgid "unable to access medium \"%s\""
msgstr ""
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
#, c-format
msgid "No package named %s"
msgstr ""
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr ""
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
#, c-format
msgid "due to missing %s"
msgstr ""
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, c-format
+msgid "due to already installed %s"
+msgstr ""
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
#, c-format
msgid "trying to promote %s"
msgstr ""
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
#, c-format
msgid "in order to keep %s"
msgstr ""
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
#, c-format
msgid "in order to install %s"
msgstr ""
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
#, c-format
msgid "due to conflicts with %s"
msgstr ""
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
#, c-format
msgid "unrequested"
msgstr ""
@@ -1176,6 +1280,16 @@ msgstr ""
msgid "Missing signature (%s)"
msgstr ""
+#: ../urpm/sys.pm:216
+#, c-format
+msgid "Can't write file"
+msgstr ""
+
+#: ../urpm/sys.pm:216
+#, c-format
+msgid "Can't open file"
+msgstr ""
+
#: ../urpme:40
#, c-format
msgid ""
@@ -1187,8 +1301,8 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr ""
@@ -1203,18 +1317,18 @@ msgstr ""
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
msgstr ""
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr ""
@@ -1224,8 +1338,8 @@ msgstr ""
msgid " --root - use another root for rpm removal.\n"
msgstr ""
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr ""
@@ -1242,17 +1356,17 @@ msgid ""
" to (un)install a chroot with --root option.\n"
msgstr ""
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr ""
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr ""
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr ""
@@ -1262,37 +1376,37 @@ msgstr ""
msgid " -a - select all packages matching expression.\n"
msgstr ""
-#: ../urpme:76
+#: ../urpme:73
#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr ""
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown packages"
msgstr ""
-#: ../urpme:107
+#: ../urpme:104
#, c-format
msgid "unknown package"
msgstr ""
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
#, c-format
msgid "removing package %s will break your system"
msgstr ""
-#: ../urpme:121
+#: ../urpme:118
#, c-format
msgid "Nothing to remove"
msgstr ""
-#: ../urpme:126
+#: ../urpme:123
#, c-format
msgid "Checking to remove the following packages"
msgstr ""
-#: ../urpme:134
+#: ../urpme:131
#, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1300,24 +1414,24 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
#, c-format
msgid " (%d MB)"
msgstr ""
-#: ../urpme:138
+#: ../urpme:135
#, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr ""
-#: ../urpme:160
+#: ../urpme:157
#, c-format
msgid "Removal failed"
msgstr ""
@@ -1338,12 +1452,12 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr ""
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
@@ -1354,12 +1468,12 @@ msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1370,7 +1484,7 @@ msgstr ""
msgid " --use-distrib - use the given path to access media\n"
msgstr ""
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1380,7 +1494,7 @@ msgstr ""
msgid " --uniq - do not print identical lines twice.\n"
msgstr ""
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr ""
@@ -1512,87 +1626,97 @@ msgstr ""
#: ../urpmf:72
#, c-format
-msgid " --name - package name\n"
+msgid " --license - license\n"
msgstr ""
#: ../urpmf:73
#, c-format
-msgid " --obsoletes - obsoletes tags\n"
+msgid " --name - package name\n"
msgstr ""
#: ../urpmf:74
#, c-format
-msgid " --packager - packager\n"
+msgid " --obsoletes - obsoletes tags\n"
msgstr ""
#: ../urpmf:75
#, c-format
-msgid " --provides - provides tags\n"
+msgid " --packager - packager\n"
msgstr ""
#: ../urpmf:76
#, c-format
-msgid " --requires - requires tags\n"
+msgid " --provides - provides tags\n"
msgstr ""
#: ../urpmf:77
#, c-format
-msgid " --size - installed size\n"
+msgid " --requires - requires tags\n"
msgstr ""
#: ../urpmf:78
#, c-format
-msgid " --sourcerpm - source rpm name\n"
+msgid " --size - installed size\n"
msgstr ""
#: ../urpmf:79
#, c-format
-msgid " --summary - summary\n"
+msgid " --sourcerpm - source rpm name\n"
msgstr ""
#: ../urpmf:80
#, c-format
-msgid " --url - url\n"
+msgid " --suggests - suggests tags\n"
msgstr ""
#: ../urpmf:81
#, c-format
-msgid " --vendor - vendor\n"
+msgid " --summary - summary\n"
msgstr ""
#: ../urpmf:82
#, c-format
+msgid " --url - url\n"
+msgstr ""
+
+#: ../urpmf:83
+#, c-format
+msgid " --vendor - vendor\n"
+msgstr ""
+
+#: ../urpmf:84
+#, c-format
msgid " -m - the media in which the package was found\n"
msgstr ""
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
-#: ../urpmf:140
+#: ../urpmf:142
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmf:227
+#: ../urpmf:229
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
"result\n"
msgstr ""
-#: ../urpmf:228
+#: ../urpmf:230
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
-#: ../urpmi:79
+#: ../urpmi:75
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1603,60 +1727,60 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpmi:88
+#: ../urpmi:84
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
msgstr ""
-#: ../urpmi:91
+#: ../urpmi:87
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
msgstr ""
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
msgstr ""
-#: ../urpmi:93
+#: ../urpmi:89
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr ""
-#: ../urpmi:94
+#: ../urpmi:90
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr ""
-#: ../urpmi:95
+#: ../urpmi:91
#, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr ""
-#: ../urpmi:96
+#: ../urpmi:92
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
"installation.\n"
msgstr ""
-#: ../urpmi:97
+#: ../urpmi:93
#, c-format
msgid " --no-install - don't install packages (only download)\n"
msgstr ""
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
" packages that lead to removals.\n"
msgstr ""
-#: ../urpmi:100
+#: ../urpmi:96
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1664,241 +1788,252 @@ msgid ""
" default is %d.\n"
msgstr ""
-#: ../urpmi:103
+#: ../urpmi:99
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr ""
-#: ../urpmi:104
+#: ../urpmi:100
#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr ""
-#: ../urpmi:105
+#: ../urpmi:101
#, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr ""
-#: ../urpmi:106
+#: ../urpmi:102
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr ""
-#: ../urpmi:107
+#: ../urpmi:103
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr ""
-#: ../urpmi:108
+#: ../urpmi:104
#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr ""
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
" dependencies checking.\n"
msgstr ""
-#: ../urpmi:112
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
" dependencies checking and integrity.\n"
msgstr ""
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr ""
-#: ../urpmi:117
+#: ../urpmi:114
#, 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:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr ""
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr ""
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr ""
-#: ../urpmi:124
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr ""
-#: ../urpmi:125
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr ""
-#: ../urpmi:126
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr ""
-#: ../urpmi:127
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr ""
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr ""
-#: ../urpmi:129
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
" (--no-resume disables it, default is disabled).\n"
msgstr ""
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, 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:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
" authentication (format is <user:password>).\n"
msgstr ""
-#: ../urpmi:135
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
" next arg.\n"
msgstr ""
-#: ../urpmi:138
+#: ../urpmi:135
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
" (--no-verify-rpm disables it, default is enabled).\n"
msgstr ""
-#: ../urpmi:140
+#: ../urpmi:137
#, c-format
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
msgstr ""
-#: ../urpmi:141
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr ""
-#: ../urpmi:142
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr ""
-#: ../urpmi:143
+#: ../urpmi:140
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
-#: ../urpmi:144
+#: ../urpmi:141
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr ""
-#: ../urpmi:145
+#: ../urpmi:142
#, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr ""
-#: ../urpmi:147
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr ""
-#: ../urpmi:148
+#: ../urpmi:145
+#, c-format
+msgid " --prefer - packages which should be preferred\n"
+msgstr ""
+
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-#: ../urpmi:150
+#: ../urpmi:148
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr ""
-#: ../urpmi:151
+#: ../urpmi:149
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr ""
-#: ../urpmi:153
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
-#: ../urpmi:154
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr ""
-#: ../urpmi:155
+#: ../urpmi:153
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr ""
-#: ../urpmi:157
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr ""
-#: ../urpmi:186
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:193
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:218
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi:243
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
"or delete it"
msgstr ""
-#: ../urpmi:244
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr ""
@@ -1908,53 +2043,55 @@ msgstr ""
msgid "Environment directory %s does not exist"
msgstr ""
-#: ../urpmi:271
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
#, c-format
msgid "%s: %s (to upgrade)"
msgstr ""
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
#, c-format
msgid "%s (to upgrade)"
msgstr ""
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
#, c-format
msgid "%s: %s (to install)"
msgstr ""
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
#, c-format
msgid "%s (to install)"
msgstr ""
-#: ../urpmi:447
+#: ../urpmi:454
#, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr ""
-#: ../urpmi:450
+#: ../urpmi:457
#, c-format
msgid "What is your choice? (1-%d) "
msgstr ""
-#: ../urpmi:481
+#: ../urpmi:498
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -1962,7 +2099,7 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:483
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -1970,33 +2107,33 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
#, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr ""
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr ""
-#: ../urpmi:503
+#: ../urpmi:520
#, c-format
msgid ""
"A requested package cannot be installed:\n"
"%s"
msgstr ""
-#: ../urpmi:504
+#: ../urpmi:521
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
"%s"
msgstr ""
-#: ../urpmi:535
+#: ../urpmi:552
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2004,7 +2141,7 @@ msgid ""
"%s\n"
msgstr ""
-#: ../urpmi:537
+#: ../urpmi:554
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2012,137 +2149,60 @@ msgid ""
"%s\n"
msgstr ""
-#: ../urpmi:544
+#: ../urpmi:561
#, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
msgstr ""
-#: ../urpmi:545
+#: ../urpmi:562
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
"%s"
msgstr ""
-#: ../urpmi:547
+#: ../urpmi:564
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
"%s\n"
msgstr ""
-#: ../urpmi:595
+#: ../urpmi:615
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:597
+#: ../urpmi:617
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:623
+#: ../urpmi:632
#, c-format
msgid "Press Enter when ready..."
msgstr ""
-#: ../urpmi:628
+#: ../urpmi:637
#, c-format
msgid "Cancel"
msgstr ""
-#: ../urpmi:671
-#, c-format
-msgid "The following package has bad signature"
-msgstr ""
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr ""
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr ""
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr ""
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr ""
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr ""
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr ""
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr ""
-
-#: ../urpmi:776
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr ""
-
-#: ../urpmi:815
-#, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr ""
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr ""
-
-#: ../urpmi:838
-#, c-format
-msgid "Package %s is already installed"
-msgstr ""
-
-#: ../urpmi:839
-#, c-format
-msgid "Packages %s are already installed"
-msgstr ""
-
-#: ../urpmi:842
-#, c-format
-msgid "Package %s can not be installed"
-msgstr ""
-
-#: ../urpmi:843
-#, c-format
-msgid "Packages %s can not be installed"
-msgstr ""
-
-#: ../urpmi:862
+#: ../urpmi:676
#, c-format
msgid "restarting urpmi"
msgstr ""
@@ -2254,49 +2314,49 @@ msgstr ""
msgid "unable to update medium \"%s\"\n"
msgstr ""
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
msgstr ""
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
#, c-format
msgid "Only superuser is allowed to add media"
msgstr ""
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
#, c-format
msgid "creating config file [%s]"
msgstr ""
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
#, c-format
msgid "Can't create config file [%s]"
msgstr ""
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr ""
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
#, c-format
msgid ""
"\n"
"Do you want to add media '%s'"
msgstr ""
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr ""
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
#, c-format
msgid "Can't use %s with remote medium"
msgstr ""
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr ""
@@ -2449,17 +2509,17 @@ msgstr ""
msgid " -y - fuzzy match on media names.\n"
msgstr ""
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:63
#, c-format
msgid "Only superuser is allowed to remove media"
msgstr ""
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:76
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr ""
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -2509,39 +2569,39 @@ msgstr ""
msgid " -f - force updating synthesis/hdlist\n"
msgstr ""
-#: ../urpmi.update:71
+#: ../urpmi.update:69
#, c-format
msgid "Only superuser is allowed to update media"
msgstr ""
-#: ../urpmi.update:79
+#: ../urpmi.update:77
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr ""
-#: ../urpmi.update:97
+#: ../urpmi.update:95
#, c-format
msgid ""
"the entry to update is missing\n"
"(one of %s)\n"
msgstr ""
-#: ../urpmi.update:101
+#: ../urpmi.update:99
#, c-format
msgid "\"%s\""
msgstr ""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "ignoring media %s"
msgstr ""
-#: ../urpmi.update:102
+#: ../urpmi.update:100
#, c-format
msgid "enabling media %s"
msgstr ""
-#: ../urpmq:43
+#: ../urpmq:40
#, c-format
msgid ""
"urpmq version %s\n"
@@ -2552,190 +2612,190 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpmq:51
+#: ../urpmq:48
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
"packages.\n"
msgstr ""
-#: ../urpmq:56
+#: ../urpmq:53
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr ""
-#: ../urpmq:59
+#: ../urpmq:56
#, c-format
msgid " --list - list available packages.\n"
msgstr ""
-#: ../urpmq:60
+#: ../urpmq:57
#, c-format
msgid " --list-media - list available media.\n"
msgstr ""
-#: ../urpmq:61
+#: ../urpmq:58
#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr ""
-#: ../urpmq:62
+#: ../urpmq:59
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
msgstr ""
-#: ../urpmq:63
+#: ../urpmq:60
#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr ""
-#: ../urpmq:64
+#: ../urpmq:61
#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr ""
-#: ../urpmq:65
+#: ../urpmq:62
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr ""
-#: ../urpmq:66
+#: ../urpmq:63
#, c-format
msgid ""
" --sources - give all source packages before downloading (root only).\n"
msgstr ""
-#: ../urpmq:68
+#: ../urpmq:65
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
msgstr ""
-#: ../urpmq:72
+#: ../urpmq:69
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
" This permit to querying a distro.\n"
msgstr ""
-#: ../urpmq:84
+#: ../urpmq:81
#, c-format
msgid " --changelog - print changelog.\n"
msgstr ""
-#: ../urpmq:85
+#: ../urpmq:82
#, c-format
msgid " --summary, -S - print summary.\n"
msgstr ""
-#: ../urpmq:87
+#: ../urpmq:84
#, c-format
msgid " --whatrequires - reverse search to what requires package.\n"
msgstr ""
-#: ../urpmq:88
+#: ../urpmq:85
#, c-format
msgid ""
" --whatrequires-recursive\n"
" - extended reverse search (includes virtual packages).\n"
msgstr ""
-#: ../urpmq:90
+#: ../urpmq:87
#, c-format
msgid ""
" --whatprovides, -p\n"
" - search in provides to find package.\n"
msgstr ""
-#: ../urpmq:93
+#: ../urpmq:90
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr ""
-#: ../urpmq:94
+#: ../urpmq:91
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr ""
-#: ../urpmq:96
+#: ../urpmq:93
#, c-format
msgid " -g - print groups with name also.\n"
msgstr ""
-#: ../urpmq:97
+#: ../urpmq:94
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
-#: ../urpmq:98
+#: ../urpmq:95
#, c-format
msgid " -l - list files in package.\n"
msgstr ""
-#: ../urpmq:99
+#: ../urpmq:96
#, c-format
msgid " -m - equivalent to -du\n"
msgstr ""
-#: ../urpmq:100
+#: ../urpmq:97
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr ""
-#: ../urpmq:101
+#: ../urpmq:98
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
-#: ../urpmq:102
+#: ../urpmq:99
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
msgstr ""
-#: ../urpmq:103
+#: ../urpmq:100
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr ""
-#: ../urpmq:104
+#: ../urpmq:101
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
-#: ../urpmq:105
+#: ../urpmq:102
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
-#: ../urpmq:181
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr ""
-#: ../urpmq:362
+#: ../urpmq:359
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:363
+#: ../urpmq:360
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
-#: ../urpmq:366
+#: ../urpmq:363
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:367
+#: ../urpmq:364
#, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
msgstr ""
-#: ../urpmq:428
+#: ../urpmq:425
#, c-format
msgid "No changelog found\n"
msgstr ""