update

1 files changed, 107 insertions, 102 deletions

diff --git a/po/urpmi.pot b/po/urpmi.pot
index e890caa7..e18c7998 100644
--- a/po/urpmi.pot
+++ b/po/urpmi.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2008-09-23 18:55+0200\n"
+"POT-Creation-Date: 2008-10-07 13:39+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"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
 #, c-format
 msgid "_Ok"
 msgstr ""
@@ -73,7 +73,7 @@ msgstr ""
 msgid "_Save"
 msgstr ""
 
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
 #, c-format
 msgid "_Cancel"
 msgstr ""
@@ -136,12 +136,12 @@ msgstr ""
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
@@ -192,37 +192,37 @@ msgstr ""
 msgid "Warning"
 msgstr ""
 
-#: ../gurpmi2:134 ../urpmi:624
+#: ../gurpmi2:134 ../urpmi:625
 #, c-format
 msgid "Ok"
 msgstr ""
 
-#: ../gurpmi2:171
+#: ../gurpmi2:170
 #, c-format
 msgid " (to upgrade)"
 msgstr ""
 
-#: ../gurpmi2:172
+#: ../gurpmi2:171
 #, c-format
 msgid " (to install)"
 msgstr ""
 
-#: ../gurpmi2:175
+#: ../gurpmi2:174
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:176
+#: ../gurpmi2:175
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr ""
 
-#: ../gurpmi2:200
+#: ../gurpmi2:199
 #, c-format
 msgid "_Abort"
 msgstr ""
 
-#: ../gurpmi2:222
+#: ../gurpmi2:221
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -230,61 +230,61 @@ msgid ""
 "Continue installation anyway?"
 msgstr ""
 
-#: ../gurpmi2:241 ../urpmi:591
+#: ../gurpmi2:240 ../urpmi:592
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr ""
 
-#: ../gurpmi2:242 ../urpmi:592
+#: ../gurpmi2:241 ../urpmi:593
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr ""
 
-#: ../gurpmi2:244
+#: ../gurpmi2:243
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gurpmi2:250
+#: ../gurpmi2:249
 #, c-format
 msgid "Package installation..."
 msgstr ""
 
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:251 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: ../gurpmi2:266 ../urpm/install.pm:81
+#: ../gurpmi2:265 ../urpm/install.pm:81
 #, c-format
 msgid "Preparing..."
 msgstr ""
 
-#: ../gurpmi2:270
+#: ../gurpmi2:269
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../gurpmi2:287 ../urpmi:619
+#: ../gurpmi2:286 ../urpmi:620
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr ""
 
-#: ../gurpmi2:298
+#: ../gurpmi2:297
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr ""
 
-#: ../gurpmi2:324
+#: ../gurpmi2:323
 #, c-format
 msgid "_Done"
 msgstr ""
 
-#: ../gurpmi2:332 ../urpm/main_loop.pm:114
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -292,28 +292,28 @@ msgid ""
 "You may want to update your urpmi database"
 msgstr ""
 
-#: ../gurpmi2:338 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
 #: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
 #, c-format
 msgid "Installation failed:"
 msgstr ""
 
-#: ../gurpmi2:343
+#: ../gurpmi2:342
 #, c-format
 msgid "The package(s) are already installed"
 msgstr ""
 
-#: ../gurpmi2:345
+#: ../gurpmi2:344
 #, c-format
 msgid "Installation finished"
 msgstr ""
 
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr ""
 
-#: ../gurpmi2:354 ../urpmi:686
+#: ../gurpmi2:353 ../urpmi:687
 #, c-format
 msgid "restarting urpmi"
 msgstr ""
@@ -350,7 +350,7 @@ msgstr ""
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr ""
 
-#: ../rurpmi:11 ../urpmi:268
+#: ../rurpmi:11 ../urpmi:269
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr ""
@@ -446,57 +446,57 @@ msgstr ""
 msgid "bad proxy declaration on command line\n"
 msgstr ""
 
-#: ../urpm/args.pm:305
+#: ../urpm/args.pm:306
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr ""
 
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:383
 #, c-format
 msgid "unexpected expression %s"
 msgstr ""
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:384
 #, c-format
 msgid "missing expression before %s"
 msgstr ""
 
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:390
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:393
+#: ../urpm/args.pm:394
 #, c-format
 msgid "no expression to close"
 msgstr ""
 
-#: ../urpm/args.pm:402
+#: ../urpm/args.pm:403
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:470
+#: ../urpm/args.pm:471
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:493
+#: ../urpm/args.pm:494
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:496 ../urpm/args.pm:499 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:507
+#: ../urpm/args.pm:508
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
 
-#: ../urpm/bug_report.pm:54 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
 #, c-format
 msgid "Copying failed"
 msgstr ""
@@ -683,53 +683,53 @@ msgstr ""
 msgid "[repackaging]"
 msgstr ""
 
-#: ../urpm/install.pm:168
+#: ../urpm/install.pm:169
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
-#: ../urpm/install.pm:171
+#: ../urpm/install.pm:172
 #, c-format
 msgid "unable to create transaction"
 msgstr ""
 
-#: ../urpm/install.pm:194
+#: ../urpm/install.pm:195
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr ""
 
-#: ../urpm/install.pm:207
+#: ../urpm/install.pm:208
 #, c-format
 msgid "unable to install package %s"
 msgstr ""
 
-#: ../urpm/install.pm:210
+#: ../urpm/install.pm:211
 #, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr ""
 
-#: ../urpm/install.pm:211 ../urpm/install.pm:268
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
 #, c-format
 msgid "removing %s failed: %s"
 msgstr ""
 
-#: ../urpm/install.pm:249
+#: ../urpm/install.pm:250
 #, c-format
 msgid "Removing package %s"
 msgstr ""
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:251
 #, c-format
 msgid "removing package %s"
 msgstr ""
 
-#: ../urpm/install.pm:266
+#: ../urpm/install.pm:267
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr ""
 
-#: ../urpm/install.pm:274
+#: ../urpm/install.pm:275
 #, c-format
 msgid "More information on package %s"
 msgstr ""
@@ -1134,13 +1134,13 @@ msgstr ""
 msgid "getting mirror list from %s"
 msgstr ""
 
-#: ../urpm/msg.pm:63 ../urpmi:501 ../urpmi:516 ../urpmi:611
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
 #, c-format
 msgid "Nn"
 msgstr ""
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:552 ../urpmi:647 ../urpmi:653
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
@@ -1384,17 +1384,17 @@ msgstr ""
 msgid "due to conflicts with %s"
 msgstr ""
 
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:49
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr ""
 
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:80
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr ""
 
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:82
 #, c-format
 msgid "Missing signature (%s)"
 msgstr ""
@@ -1455,7 +1455,7 @@ msgstr ""
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
 #, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr ""
@@ -1488,7 +1488,7 @@ msgid ""
 "                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
 #, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
 msgstr ""
@@ -1552,7 +1552,7 @@ msgid_plural "Remove %d packages?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../urpme:161 ../urpmi:553 ../urpmi:648 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
 #, c-format
 msgid " (y/N) "
 msgstr ""
@@ -2059,147 +2059,152 @@ msgstr ""
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr ""
 
-#: ../urpmi:142
+#: ../urpmi:141
 #, c-format
-msgid "  --skip         - packages which installation should be skipped\n"
+msgid "  --replacefiles - ignore file conflicts\n"
 msgstr ""
 
 #: ../urpmi:143
 #, c-format
-msgid "  --prefer       - packages which should be preferred\n"
+msgid "  --skip         - packages which installation should be skipped\n"
 msgstr ""
 
 #: ../urpmi:144
 #, c-format
+msgid "  --prefer       - packages which should be preferred\n"
+msgstr ""
+
+#: ../urpmi:145
+#, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
 msgstr ""
 
-#: ../urpmi:146
+#: ../urpmi:147
 #, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr ""
 
-#: ../urpmi:147
+#: ../urpmi:148
 #, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr ""
 
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: ../urpmi:151
+#: ../urpmi:152
 #, c-format
 msgid "  --quiet, -q    - quiet mode.\n"
 msgstr ""
 
-#: ../urpmi:153
+#: ../urpmi:154
 #, c-format
 msgid "  --debug        - very verbose mode.\n"
 msgstr ""
 
-#: ../urpmi:154
+#: ../urpmi:155
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpmi:182
+#: ../urpmi:183
 #, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr ""
 
-#: ../urpmi:189
+#: ../urpmi:190
 #, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
 msgstr ""
 
-#: ../urpmi:219
+#: ../urpmi:220
 #, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr ""
 
-#: ../urpmi:220
+#: ../urpmi:221
 #, c-format
 msgid "You can't install spec files"
 msgstr ""
 
-#: ../urpmi:227
+#: ../urpmi:228
 #, c-format
 msgid "defaulting to --buildrequires"
 msgstr ""
 
-#: ../urpmi:232
+#: ../urpmi:233
 #, c-format
 msgid ""
 "please use --buildrequires or --install-src, defaulting to --buildrequires"
 msgstr ""
 
-#: ../urpmi:252
+#: ../urpmi:253
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr ""
 
-#: ../urpmi:253
+#: ../urpmi:254
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr ""
 
-#: ../urpmi:274
+#: ../urpmi:275
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
 "Use --allow-force to force operation."
 msgstr ""
 
-#: ../urpmi:348
+#: ../urpmi:349
 #, c-format
 msgid "Updating media...\n"
 msgstr ""
 
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:435
+#: ../urpmi:436
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr ""
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:437
+#: ../urpmi:438
 #, c-format
 msgid "%s (to upgrade)"
 msgstr ""
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:441
+#: ../urpmi:442
 #, c-format
 msgid "%s: %s (to install)"
 msgstr ""
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:444
 #, c-format
 msgid "%s (to install)"
 msgstr ""
 
-#: ../urpmi:449
+#: ../urpmi:450
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr ""
 
-#: ../urpmi:452
+#: ../urpmi:453
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr ""
 
-#: ../urpmi:494
+#: ../urpmi:495
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2207,7 +2212,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../urpmi:496
+#: ../urpmi:497
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2215,38 +2220,38 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../urpmi:502 ../urpmi:517
+#: ../urpmi:503 ../urpmi:518
 #, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr ""
 
-#: ../urpmi:503 ../urpmi:518 ../urpmi:612 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr ""
 
-#: ../urpmi:511
+#: ../urpmi:512
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: ../urpmi:512
+#: ../urpmi:513
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: ../urpmi:529
+#: ../urpmi:530
 #, c-format
 msgid "removing package %s will break your system"
 msgstr ""
 
-#: ../urpmi:537
+#: ../urpmi:538
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2254,7 +2259,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../urpmi:539
+#: ../urpmi:540
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2262,12 +2267,12 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../urpmi:547
+#: ../urpmi:548
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:567
+#: ../urpmi:568
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2275,46 +2280,46 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../urpmi:578
+#: ../urpmi:579
 #, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../urpmi:594
+#: ../urpmi:595
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:600
+#: ../urpmi:601
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr ""
 
-#: ../urpmi:601
+#: ../urpmi:602
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr ""
 
-#: ../urpmi:602
+#: ../urpmi:603
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr ""
 
-#: ../urpmi:603
+#: ../urpmi:604
 #, 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:624
+#: ../urpmi:625
 #, c-format
 msgid "Cancel"
 msgstr ""
 
-#: ../urpmi:632
+#: ../urpmi:633
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr ""