Surprisingly, xgettext does a better job than perl_checker at extracting

strings from Perl code.

2 files changed, 306 insertions, 422 deletions

diff --git a/po/Makefile b/po/Makefile
index d15e46e8..3271f59c 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -35,11 +35,14 @@ merge: $(PGOAL).pot
 
 $(PGOAL).pot: $(CFILES)
 	xgettext -F -n --add-comments \
-	--keyword=_ --keyword=__ --keyword=N_ --keyword=N \
-	--keyword=gettext \
-	--language=C -o placeholder.pot $(CFILES)
-	perl_checker -q --generate-pot $(PGOAL)_tmp.pot $(PL_FILES) || rm -f $(PGOAL)_tmp.pot
+	  --keyword=_ --keyword=__ --keyword=N_ --keyword=N \
+	  --keyword=gettext \
+	  --language=C -o placeholder.pot $(CFILES)
+	xgettext -F -n --add-comments \
+	  --keyword=N_ --keyword=N \
+	  --language=Perl -o $(PGOAL)_tmp.pot $(PL_FILES)
 	[ ! -e $(PGOAL)_tmp.pot ] || msgcat --use-first placeholder.pot $(PGOAL)_tmp.pot > $@
+	perl -pi -es/perl-format/c-format/ $@
 	rm -f placeholder.pot $(PGOAL)_tmp.pot
 
 install: all
diff --git a/po/urpmi.pot b/po/urpmi.pot
index 59d77333..54f4e7b2 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-10-27 16:02+0200\n"
+"POT-Creation-Date: 2005-11-03 17:28+0100\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"
@@ -34,49 +34,11 @@ msgstr ""
 msgid "Nn"
 msgstr ""
 
-#: ../_irpm:23
-#, c-format
-msgid "installing %s\n"
-msgstr ""
-
-#: ../_irpm:33
-#, c-format
-msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
-msgstr ""
-
-#: ../_irpm:33 ../urpme:31 ../urpmi:498
-#, c-format
-msgid "Is this OK?"
-msgstr ""
-
-#: ../_irpm:35 ../urpmi:529
-#, c-format
-msgid "Ok"
-msgstr ""
-
-#: ../_irpm:36 ../urpmi:529
-#, c-format
-msgid "Cancel"
-msgstr ""
-
-#: ../_irpm:44 ../urpmi:404 ../urpmi:422 ../urpmi:502
-#, c-format
-msgid " (Y/n) "
-msgstr ""
-
-#: ../_irpm:63
-#, c-format
-msgid "%s: command not found\n"
-msgstr ""
-
-#: ../gurpmi:31 ../gurpmi2:55
-#, c-format
+#: ../gurpmi:29 ../gurpmi2:55
 msgid "RPM installation"
 msgstr ""
 
-#: ../gurpmi:48
+#: ../gurpmi:50
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -89,7 +51,7 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../gurpmi:56
+#: ../gurpmi:58
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -99,7 +61,7 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../gurpmi:61
+#: ../gurpmi:63
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -109,33 +71,37 @@ msgid ""
 "Proceed?"
 msgstr ""
 
-#: ../gurpmi:71
-#, c-format
+#. - buttons
+#: ../gurpmi:73
 msgid "_Install"
 msgstr ""
 
-#: ../gurpmi:72
-#, c-format
+#: ../gurpmi:74
 msgid "_Save"
 msgstr ""
 
-#: ../gurpmi:73 ../gurpmi2:119
-#, c-format
+#: ../gurpmi:75 ../gurpmi2:119
 msgid "_Cancel"
 msgstr ""
 
-#: ../gurpmi:83
-#, c-format
+#: ../gurpmi:85
 msgid "Choose location to save file"
 msgstr ""
 
-#: ../gurpmi2:36
+#: ../gurpmi.pm:57
 #, c-format
+msgid "Unknown option %s"
+msgstr ""
+
+#: ../gurpmi.pm:61
+msgid "No packages specified"
+msgstr ""
+
+#: ../gurpmi2:36
 msgid "Please wait..."
 msgstr ""
 
 #: ../gurpmi2:45
-#, c-format
 msgid "Must be root"
 msgstr ""
 
@@ -148,32 +114,26 @@ msgid ""
 msgstr ""
 
 #: ../gurpmi2:115
-#, c-format
 msgid " (to upgrade)"
 msgstr ""
 
 #: ../gurpmi2:116
-#, c-format
 msgid " (to install)"
 msgstr ""
 
 #: ../gurpmi2:119
-#, c-format
 msgid "Package choice"
 msgstr ""
 
 #: ../gurpmi2:119 ../gurpmi2:142
-#, c-format
 msgid "_Ok"
 msgstr ""
 
-#: ../gurpmi2:120 ../urpmi:364
-#, c-format
+#: ../gurpmi2:120 ../urpmi:365
 msgid "One of the following packages is needed:"
 msgstr ""
 
 #: ../gurpmi2:143
-#, c-format
 msgid "_Abort"
 msgstr ""
 
@@ -194,16 +154,14 @@ msgid ""
 msgstr ""
 
 #: ../gurpmi2:184
-#, c-format
 msgid "Package installation..."
 msgstr ""
 
-#: ../gurpmi2:186 ../urpmi:511 ../urpmq:307
-#, c-format
+#: ../gurpmi2:186 ../urpmi:512 ../urpmq:308
 msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: ../gurpmi2:200 ../urpmi:522
+#: ../gurpmi2:200 ../urpmi:523
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
@@ -222,7 +180,7 @@ msgid ""
 "Do you want to continue installation ?"
 msgstr ""
 
-#: ../gurpmi2:251 ../gurpmi2:300 ../urpmi:593 ../urpmi:710
+#: ../gurpmi2:251 ../gurpmi2:300 ../urpmi:594 ../urpmi:711
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -230,13 +188,12 @@ msgid ""
 "You may want to update your urpmi database"
 msgstr ""
 
-#: ../gurpmi2:258 ../urpme:118 ../urpmi:636
+#: ../gurpmi2:258 ../urpme:118 ../urpmi:637
 #, c-format
 msgid "removing %s"
 msgstr ""
 
-#: ../gurpmi2:266 ../urpm.pm:2901
-#, c-format
+#: ../gurpmi2:266 ../urpm.pm:2902
 msgid "Preparing..."
 msgstr ""
 
@@ -245,23 +202,19 @@ msgstr ""
 msgid "Installing package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../gurpmi2:286 ../urpmi:603 ../urpmi:655 ../urpmi:673 ../urpmi:689
-#, c-format
+#: ../gurpmi2:286 ../urpmi:604 ../urpmi:656 ../urpmi:674 ../urpmi:690
 msgid "Installation failed"
 msgstr ""
 
 #: ../gurpmi2:295
-#, c-format
 msgid "_Done"
 msgstr ""
 
-#: ../gurpmi2:303 ../urpmi:726
-#, c-format
+#: ../gurpmi2:303 ../urpmi:727
 msgid "The package(s) are already installed"
 msgstr ""
 
 #: ../gurpmi2:305
-#, c-format
 msgid "Installation finished"
 msgstr ""
 
@@ -273,17 +226,14 @@ msgid ""
 msgstr ""
 
 #: ../rpm-find-leaves:16
-#, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr ""
 
 #: ../rpm-find-leaves:17
-#, c-format
 msgid "   --root <path>  - use the given root instead of /\n"
 msgstr ""
 
 #: ../rpm-find-leaves:18
-#, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr ""
 
@@ -292,54 +242,55 @@ msgstr ""
 msgid "                    defaults is %s.\n"
 msgstr ""
 
-#: ../rurpmi:8 ../urpmi:227
-#, c-format
+#. - need to be root if binary rpms are to be installed
+#: ../rurpmi:8 ../urpmi:228
 msgid "Only superuser is allowed to install packages"
 msgstr ""
 
 #: ../rurpmi:15
-#, c-format
 msgid "Running urpmi in restricted mode..."
 msgstr ""
 
-#: ../urpm.pm:71
+#: ../urpm.pm:70
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr ""
 
-#: ../urpm.pm:104
+#: ../urpm.pm:103
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpm.pm:120
+#: ../urpm.pm:119
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr ""
 
-#: ../urpm.pm:211
+#: ../urpm.pm:210
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:212
+#: ../urpm.pm:211
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:225 ../urpm.pm:1314 ../urpm.pm:1324
+#: ../urpm.pm:224 ../urpm.pm:1314 ../urpm.pm:1324
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:228 ../urpm.pm:2508
+#. list file exists but isn't readable
+#. report error only if no result found, list files are only readable by root
+#: ../urpm.pm:227 ../urpm.pm:2509
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:258
+#: ../urpm.pm:255
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "trying to override existing medium \"%s\", skipping"
 msgstr ""
 
 #: ../urpm.pm:266
@@ -374,6 +325,7 @@ msgstr ""
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
 
+#. - return value is suitable for an hash.
 #: ../urpm.pm:361
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
@@ -410,7 +362,6 @@ msgid "wrote config file [%s]"
 msgstr ""
 
 #: ../urpm.pm:440
-#, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 
@@ -445,12 +396,20 @@ msgid "there doesn't seem to be devices in the chroot in \"%s\""
 msgstr ""
 
 #: ../urpm.pm:495
-#, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
 "update or --parallel"
 msgstr ""
 
+#. - XXX we could link the new hdlist to the old one.
+#. - (However links need to be managed. see bug #12391.)
+#. - as previously done, just read synthesis file here, this is enough.
+#. - as previously done, just read synthesis file here, this is enough, but only
+#. - if synthesis exists, else it needs to be recomputed.
+#. - XXX we could link the new hdlist to the old one.
+#. - (However links need to be managed. see bug #12391.)
+#. - 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:556 ../urpm.pm:582 ../urpm.pm:1068 ../urpm.pm:1079
 #: ../urpm.pm:1151 ../urpm.pm:1168 ../urpm.pm:1238 ../urpm.pm:1297
 #: ../urpm.pm:1512 ../urpm.pm:1635 ../urpm.pm:1752 ../urpm.pm:1758
@@ -477,6 +436,7 @@ msgstr ""
 msgid "Search start: %s end: %s"
 msgstr ""
 
+#. - this is almost a fatal error, ignore it by default?
 #: ../urpm.pm:605 ../urpm.pm:1089 ../urpm.pm:1176 ../urpm.pm:1247
 #: ../urpm.pm:1643
 #, c-format
@@ -484,7 +444,6 @@ msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr ""
 
 #: ../urpm.pm:612 ../urpm.pm:1899
-#, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr ""
 
@@ -498,9 +457,10 @@ msgstr ""
 msgid "would install instead of upgrade package %s"
 msgstr ""
 
-#: ../urpm.pm:652 ../urpm.pm:2315 ../urpm.pm:2376 ../urpm.pm:2565
-#: ../urpm.pm:2966 ../urpm.pm:3088
-#, c-format
+#. - beware this can be a child process or the main process now...
+#. - open in read/write mode unless testing installation.
+#: ../urpm.pm:652 ../urpm.pm:2315 ../urpm.pm:2376 ../urpm.pm:2566
+#: ../urpm.pm:2967 ../urpm.pm:3093
 msgid "unable to open rpmdb"
 msgstr ""
 
@@ -510,7 +470,6 @@ msgid "medium \"%s\" already exists"
 msgstr ""
 
 #: ../urpm.pm:699
-#, c-format
 msgid "virtual medium needs to be local"
 msgstr ""
 
@@ -520,42 +479,35 @@ msgid "added medium %s"
 msgstr ""
 
 #: ../urpm.pm:769
-#, c-format
 msgid "unable to access first installation medium"
 msgstr ""
 
 #: ../urpm.pm:773
-#, c-format
 msgid "copying hdlists file..."
 msgstr ""
 
 #: ../urpm.pm:775 ../urpm.pm:1192 ../urpm.pm:1267
-#, c-format
 msgid "...copying done"
 msgstr ""
 
 #: ../urpm.pm:776 ../urpm.pm:1193 ../urpm.pm:1342 ../urpm.pm:1401
 #: ../urpm.pm:1581 ../urpm.pm:1588
-#, c-format
 msgid "...copying failed"
 msgstr ""
 
 #: ../urpm.pm:779 ../urpm.pm:804 ../urpm.pm:843
-#, c-format
 msgid "unable to access first installation medium (no hdlists file found)"
 msgstr ""
 
 #: ../urpm.pm:786
-#, c-format
 msgid "retrieving hdlists file..."
 msgstr ""
 
-#: ../urpm.pm:798 ../urpm.pm:1625 ../urpm.pm:2115 ../urpm.pm:2834
-#, c-format
+#: ../urpm.pm:798 ../urpm.pm:1625 ../urpm.pm:2115 ../urpm.pm:2835
 msgid "...retrieving done"
 msgstr ""
 
-#: ../urpm.pm:800 ../urpm.pm:1609 ../urpm.pm:2119 ../urpm.pm:2836
+#: ../urpm.pm:800 ../urpm.pm:1609 ../urpm.pm:2119 ../urpm.pm:2837
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr ""
@@ -570,6 +522,7 @@ msgstr ""
 msgid "trying to select nonexistent medium \"%s\""
 msgstr ""
 
+#. - several elements in found and/or foundi lists.
 #: ../urpm.pm:882
 #, c-format
 msgid "selecting multiple media: %s"
@@ -586,12 +539,10 @@ msgid "reconfiguring urpmi for media \"%s\""
 msgstr ""
 
 #: ../urpm.pm:978
-#, c-format
 msgid "...reconfiguration failed"
 msgstr ""
 
 #: ../urpm.pm:985
-#, c-format
 msgid "reconfiguration done"
 msgstr ""
 
@@ -616,7 +567,6 @@ msgid "copying description file of \"%s\"..."
 msgstr ""
 
 #: ../urpm.pm:1214 ../urpm.pm:1488
-#, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr ""
 
@@ -631,7 +581,6 @@ msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
 
 #: ../urpm.pm:1282
-#, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr ""
 
@@ -651,7 +600,6 @@ msgid "reading rpm files from [%s]"
 msgstr ""
 
 #: ../urpm.pm:1374
-#, c-format
 msgid "no rpms read"
 msgstr ""
 
@@ -665,6 +613,8 @@ msgstr ""
 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:1538
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
@@ -676,17 +626,14 @@ msgid "found probed hdlist (or synthesis) as %s"
 msgstr ""
 
 #: ../urpm.pm:1616
-#, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr ""
 
 #: ../urpm.pm:1618
-#, c-format
 msgid "...retrieving failed: md5sum mismatch"
 msgstr ""
 
 #: ../urpm.pm:1716
-#, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr ""
 
@@ -745,6 +692,7 @@ msgstr ""
 msgid "building hdlist [%s]"
 msgstr ""
 
+#. - XXX this happens when building a synthesis for a local media from RPMs... why ?
 #: ../urpm.pm:1933 ../urpm.pm:1968
 #, c-format
 msgid ""
@@ -752,7 +700,7 @@ msgid ""
 "corrupted."
 msgstr ""
 
-#: ../urpm.pm:1936 ../urpm.pm:1971 ../urpmi:321
+#: ../urpm.pm:1936 ../urpm.pm:1971 ../urpmi:322
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr ""
@@ -793,17 +741,14 @@ msgid "unable to access rpm file [%s]"
 msgstr ""
 
 #: ../urpm.pm:2129
-#, c-format
 msgid "unable to register rpm file"
 msgstr ""
 
 #: ../urpm.pm:2132
-#, c-format
 msgid "error registering local packages"
 msgstr ""
 
 #: ../urpm.pm:2156
-#, c-format
 msgid "Search"
 msgstr ""
 
@@ -817,186 +762,181 @@ msgstr ""
 msgid "The following packages contain %s: %s"
 msgstr ""
 
-#: ../urpm.pm:2439 ../urpm.pm:2485 ../urpm.pm:2516
+#: ../urpm.pm:2439 ../urpm.pm:2486 ../urpm.pm:2517
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: ../urpm.pm:2499
+#: ../urpm.pm:2500
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr ""
 
-#: ../urpm.pm:2532
+#: ../urpm.pm:2533
 #, 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:2536
+#: ../urpm.pm:2537
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr ""
 
-#: ../urpm.pm:2548
+#: ../urpm.pm:2549
 #, c-format
 msgid "package %s is not found."
 msgstr ""
 
-#: ../urpm.pm:2606 ../urpm.pm:2620 ../urpm.pm:2640 ../urpm.pm:2654
-#, c-format
+#: ../urpm.pm:2607 ../urpm.pm:2621 ../urpm.pm:2641 ../urpm.pm:2655
 msgid "urpmi database locked"
 msgstr ""
 
-#: ../urpm.pm:2706 ../urpm.pm:2711 ../urpm.pm:2737
+#: ../urpm.pm:2707 ../urpm.pm:2712 ../urpm.pm:2738
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr ""
 
-#: ../urpm.pm:2733
+#. - fallback to use other method for retrieving the file later.
+#: ../urpm.pm:2734
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:2741
+#. - we have a removable device that is not removable, well...
+#: ../urpm.pm:2742
 #, c-format
 msgid "inconsistent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: ../urpm.pm:2753
+#: ../urpm.pm:2754
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:2812
+#: ../urpm.pm:2813
 #, c-format
 msgid "malformed input: [%s]"
 msgstr ""
 
-#: ../urpm.pm:2819
+#: ../urpm.pm:2820
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:2939
+#: ../urpm.pm:2940
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr ""
 
-#: ../urpm.pm:2970
+#: ../urpm.pm:2971
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
-#: ../urpm.pm:2973
-#, c-format
+#: ../urpm.pm:2974
 msgid "unable to create transaction"
 msgstr ""
 
-#: ../urpm.pm:2981
+#: ../urpm.pm:2982
 #, c-format
 msgid "removing package %s"
 msgstr ""
 
-#: ../urpm.pm:2983
+#: ../urpm.pm:2984
 #, c-format
 msgid "unable to remove package %s"
 msgstr ""
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2996
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr ""
 
-#: ../urpm.pm:3001
+#: ../urpm.pm:3002
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr ""
 
-#: ../urpm.pm:3004
+#: ../urpm.pm:3005
 #, c-format
 msgid "unable to install package %s"
 msgstr ""
 
-#: ../urpm.pm:3063
+#: ../urpm.pm:3064
 #, c-format
 msgid "More information on package %s"
 msgstr ""
 
-#: ../urpm.pm:3228 ../urpm.pm:3261
+#: ../urpm.pm:3235 ../urpm.pm:3268
 #, c-format
 msgid "due to missing %s"
 msgstr ""
 
-#: ../urpm.pm:3229 ../urpm.pm:3259
+#: ../urpm.pm:3236 ../urpm.pm:3266
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpm.pm:3230
+#: ../urpm.pm:3237
 #, c-format
 msgid "trying to promote %s"
 msgstr ""
 
-#: ../urpm.pm:3231
+#: ../urpm.pm:3238
 #, c-format
 msgid "in order to keep %s"
 msgstr ""
 
-#: ../urpm.pm:3254
+#: ../urpm.pm:3261
 #, c-format
 msgid "in order to install %s"
 msgstr ""
 
-#: ../urpm.pm:3265
+#: ../urpm.pm:3272
 #, c-format
 msgid "due to conflicts with %s"
 msgstr ""
 
-#: ../urpm.pm:3266
-#, c-format
+#: ../urpm.pm:3273
 msgid "unrequested"
 msgstr ""
 
-#: ../urpm.pm:3282
+#: ../urpm.pm:3289
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr ""
 
-#: ../urpm.pm:3314
+#: ../urpm.pm:3321
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr ""
 
-#: ../urpm.pm:3316
+#: ../urpm.pm:3323
 #, c-format
 msgid "Missing signature (%s)"
 msgstr ""
 
-#: ../urpm.pm:3365
-#, c-format
+#: ../urpm.pm:3383
 msgid "examining MD5SUM file"
 msgstr ""
 
-#: ../urpm.pm:3376
+#: ../urpm.pm:3394
 #, c-format
 msgid "warning: md5sum for %s unavailable in MD5SUM file"
 msgstr ""
 
-#: ../urpm.pm:3398
-#, c-format
+#: ../urpm.pm:3416
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
 
 #: ../urpm/args.pm:99 ../urpm/args.pm:108
-#, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr ""
 
 #: ../urpm/args.pm:217
-#, c-format
 msgid "You need to be root to use --use-distrib"
 msgstr ""
 
@@ -1006,10 +946,106 @@ msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr ""
 
 #: ../urpm/msg.pm:82
-#, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr ""
 
+#: ../urpm/parallel_ka_run.pm:9 ../urpm/parallel_ka_run.pm:103
+#: ../urpm/parallel_ka_run.pm:197
+msgid "mput failed, maybe a node is unreacheable"
+msgstr ""
+
+#: ../urpm/parallel_ka_run.pm:70 ../urpm/parallel_ka_run.pm:182
+#: ../urpm/parallel_ka_run.pm:211
+msgid "rshp failed, maybe a node is unreacheable"
+msgstr ""
+
+#: ../urpm/parallel_ka_run.pm:79 ../urpm/parallel_ssh.pm:96
+#, c-format
+msgid "on node %s"
+msgstr ""
+
+#. - first propagate the synthesis file to all machine.
+#: ../urpm/parallel_ka_run.pm:101
+msgid "Propagating synthesis to nodes..."
+msgstr ""
+
+#. - now try an iteration of urpmq.
+#: ../urpm/parallel_ka_run.pm:152
+msgid "Resolving dependencies on nodes..."
+msgstr ""
+
+#: ../urpm/parallel_ka_run.pm:195
+msgid "Distributing files to nodes..."
+msgstr ""
+
+#: ../urpm/parallel_ka_run.pm:201
+msgid "Verifying if install is possible on nodes..."
+msgstr ""
+
+#: ../urpm/parallel_ka_run.pm:215 ../urpm/parallel_ssh.pm:243
+#, c-format
+msgid "Installation failed on node %s"
+msgstr ""
+
+#: ../urpm/parallel_ka_run.pm:220 ../urpm/parallel_ssh.pm:248 ../urpmi:724
+msgid "Installation is possible"
+msgstr ""
+
+#. - continue installation.
+#: ../urpm/parallel_ka_run.pm:225
+msgid "Installing packages on nodes..."
+msgstr ""
+
+#: ../urpm/parallel_ssh.pm:22 ../urpm/parallel_ssh.pm:120
+#: ../urpm/parallel_ssh.pm:224
+#, c-format
+msgid "scp failed on host %s (%d)"
+msgstr ""
+
+#: ../urpm/parallel_ssh.pm:118
+#, c-format
+msgid "Propagating synthesis to %s..."
+msgstr ""
+
+#: ../urpm/parallel_ssh.pm:171
+#, c-format
+msgid "Resolving dependencies on %s..."
+msgstr ""
+
+#: ../urpm/parallel_ssh.pm:201
+#, c-format
+msgid "host %s does not have a good version of urpmi (%d)"
+msgstr ""
+
+#: ../urpm/parallel_ssh.pm:217
+#, c-format
+msgid "Distributing files to %s..."
+msgstr ""
+
+#: ../urpm/parallel_ssh.pm:231
+#, c-format
+msgid "Verifying if install is possible on %s..."
+msgstr ""
+
+#: ../urpm/parallel_ssh.pm:255
+#, c-format
+msgid "Performing install on %s..."
+msgstr ""
+
+#: ../urpm/parallel_ssh.pm:268
+#, c-format
+msgid "Installing %s on %s..."
+msgstr ""
+
+#: ../urpm/parallel_ssh.pm:269
+#, c-format
+msgid "Preparing install on %s..."
+msgstr ""
+
+#: ../urpme:31 ../urpmi:499
+msgid "Is this OK?"
+msgstr ""
+
 #: ../urpme:38
 #, c-format
 msgid ""
@@ -1021,83 +1057,69 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../urpme:43 ../urpmf:33 ../urpmi:79 ../urpmi.addmedia:43
+#: ../urpme:43 ../urpmf:33 ../urpmi:78 ../urpmi.addmedia:43
 #: ../urpmi.removemedia:48 ../urpmi.update:30 ../urpmq:43
-#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr ""
 
-#: ../urpme:44 ../urpmi:86
-#, c-format
+#: ../urpme:44 ../urpmi:85
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 
 #: ../urpme:45
-#, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr ""
 
-#: ../urpme:46 ../urpmi:101 ../urpmq:64
-#, c-format
+#: ../urpme:46 ../urpmi:100 ../urpmq:64
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: ../urpme:47 ../urpmi:106 ../urpmq:65
-#, c-format
+#: ../urpme:47 ../urpmi:105 ../urpmq:65
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 
 #: ../urpme:48
-#, c-format
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr ""
 
 #: ../urpme:49
-#, 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:51 ../urpmi:139 ../urpmi.addmedia:74 ../urpmi.removemedia:53
+#: ../urpme:51 ../urpmi:138 ../urpmi.addmedia:74 ../urpmi.removemedia:53
 #: ../urpmi.update:48 ../urpmq:91
-#, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr ""
 
 #: ../urpme:52
-#, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
 #: ../urpme:68
-#, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr ""
 
 #: ../urpme:89
-#, c-format
-msgid "unknown packages"
+msgid "unknown package"
 msgstr ""
 
 #: ../urpme:89
-#, c-format
-msgid "unknown package"
+msgid "unknown packages"
 msgstr ""
 
-#: ../urpme:99 ../urpmi:437
+#: ../urpme:99 ../urpmi:438
 #, c-format
 msgid "removing package %s will break your system"
 msgstr ""
 
 #: ../urpme:102
-#, c-format
 msgid "Nothing to remove"
 msgstr ""
 
 #: ../urpme:106
-#, c-format
 msgid "Checking to remove the following packages"
 msgstr ""
 
@@ -1107,13 +1129,11 @@ msgid ""
 "To satisfy dependencies, the following %d packages will be removed (%d MB)"
 msgstr ""
 
-#: ../urpme:115 ../urpmi:456 ../urpmi:586
-#, c-format
+#: ../urpme:115 ../urpmi:457 ../urpmi:587
 msgid " (y/N) "
 msgstr ""
 
 #: ../urpme:122
-#, c-format
 msgid "Removing failed"
 msgstr ""
 
@@ -1129,109 +1149,88 @@ msgid ""
 msgstr ""
 
 #: ../urpmf:34
-#, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr ""
 
-#: ../urpmf:35 ../urpmi:121 ../urpmq:74
-#, c-format
+#: ../urpmf:35 ../urpmi:120 ../urpmq:74
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 
-#: ../urpmf:36 ../urpmi:83 ../urpmq:47
-#, c-format
+#: ../urpmf:36 ../urpmi:82 ../urpmq:47
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 
 #: ../urpmf:37
-#, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpmf:38 ../urpmi:81 ../urpmq:45
-#, c-format
+#: ../urpmf:38 ../urpmi:80 ../urpmq:45
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:39 ../urpmi:84 ../urpmq:48
-#, c-format
+#: ../urpmf:39 ../urpmi:83 ../urpmq:48
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:40 ../urpmi:85 ../urpmq:49
-#, c-format
+#: ../urpmf:40 ../urpmi:84 ../urpmq:49
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
 #: ../urpmf:41
-#, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr ""
 
-#: ../urpmf:42 ../urpmi:80 ../urpmq:44
-#, c-format
+#: ../urpmf:42 ../urpmi:79 ../urpmq:44
 msgid "  --update       - use only update media.\n"
 msgstr ""
 
 #: ../urpmf:43
-#, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr ""
 
 #: ../urpmf:44
-#, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr ""
 
 #: ../urpmf:45
-#, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
 #: ../urpmf:46
-#, c-format
 msgid "Pattern expressions:\n"
 msgstr ""
 
 #: ../urpmf:47
-#, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
 #: ../urpmf:48
-#, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
 #: ../urpmf:49
-#, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr ""
 
 #: ../urpmf:50
-#, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr ""
 
 #: ../urpmf:51
-#, c-format
 msgid "  !              - unary NOT.\n"
 msgstr ""
 
 #: ../urpmf:52
-#, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr ""
 
 #: ../urpmf:53
-#, c-format
 msgid "List of tags:\n"
 msgstr ""
 
 #: ../urpmf:54
-#, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr ""
 
@@ -1241,143 +1240,117 @@ msgid "                   example: '%%name:%%files'\n"
 msgstr ""
 
 #: ../urpmf:56
-#, c-format
 msgid "  --arch         - architecture\n"
 msgstr ""
 
 #: ../urpmf:57
-#, c-format
 msgid "  --buildhost    - build host\n"
 msgstr ""
 
 #: ../urpmf:58
-#, c-format
 msgid "  --buildtime    - build time\n"
 msgstr ""
 
 #: ../urpmf:59
-#, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr ""
 
 #: ../urpmf:60
-#, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr ""
 
 #: ../urpmf:61
-#, c-format
 msgid "  --description  - package description\n"
 msgstr ""
 
 #: ../urpmf:62
-#, c-format
 msgid "  --distribution - distribution\n"
 msgstr ""
 
 #: ../urpmf:63
-#, c-format
 msgid "  --epoch        - epoch\n"
 msgstr ""
 
 #: ../urpmf:64
-#, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr ""
 
 #: ../urpmf:65
-#, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr ""
 
 #: ../urpmf:66
-#, c-format
 msgid "  --group        - group\n"
 msgstr ""
 
 #: ../urpmf:67
-#, c-format
 msgid "  --name         - package name\n"
 msgstr ""
 
 #: ../urpmf:68
-#, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr ""
 
 #: ../urpmf:69
-#, c-format
 msgid "  --packager     - packager\n"
 msgstr ""
 
 #: ../urpmf:70
-#, c-format
 msgid "  --provides     - provides tags\n"
 msgstr ""
 
 #: ../urpmf:71
-#, c-format
 msgid "  --requires     - requires tags\n"
 msgstr ""
 
 #: ../urpmf:72
-#, c-format
 msgid "  --size         - installed size\n"
 msgstr ""
 
 #: ../urpmf:73
-#, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr ""
 
 #: ../urpmf:74
-#, c-format
 msgid "  --summary      - summary\n"
 msgstr ""
 
 #: ../urpmf:75
-#, c-format
 msgid "  --url          - url\n"
 msgstr ""
 
 #: ../urpmf:76
-#, c-format
 msgid "  --vendor       - vendor\n"
 msgstr ""
 
 #: ../urpmf:77
-#, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr ""
 
 #: ../urpmf:78 ../urpmq:80
-#, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
 #: ../urpmf:130
-#, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:172 ../urpmi:216 ../urpmq:115
+#: ../urpmf:172 ../urpmi:217 ../urpmq:116
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr ""
 
 #: ../urpmf:218
-#, c-format
 msgid ""
 "Note: since no media searched uses hdlists, urpmf was unable to return any "
 "result\n"
 msgstr ""
 
 #: ../urpmf:219
-#, c-format
 msgid "You may want to use --name to search for package names.\n"
 msgstr ""
 
-#: ../urpmi:74
+#: ../urpmi:73
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1388,39 +1361,34 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../urpmi:82 ../urpmq:46
-#, c-format
+#: ../urpmi:81 ../urpmq:46
 msgid ""
 "  --searchmedia  - use only the given media to search requested (or updated) "
 "packages.\n"
 msgstr ""
 
-#: ../urpmi:87 ../urpmq:50
-#, c-format
+#: ../urpmi:86 ../urpmq:50
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 
-#: ../urpmi:88
-#, c-format
+#: ../urpmi:87
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr ""
 
-#: ../urpmi:89
-#, c-format
+#: ../urpmi:88
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr ""
 
-#: ../urpmi:90 ../urpmq:52
-#, c-format
+#: ../urpmi:89 ../urpmq:52
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that lead to removals.\n"
 msgstr ""
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1428,226 +1396,192 @@ msgid ""
 "                   default is %d.\n"
 msgstr ""
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpmi:96 ../urpmq:51
-#, c-format
+#: ../urpmi:95 ../urpmq:51
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
 
-#: ../urpmi:97 ../urpmq:60
-#, c-format
+#: ../urpmi:96 ../urpmq:60
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 
-#: ../urpmi:98
-#, c-format
+#: ../urpmi:97
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
-#: ../urpmi:99
-#, c-format
+#: ../urpmi:98
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 
-#: ../urpmi:100
-#, c-format
+#: ../urpmi:99
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr ""
 
-#: ../urpmi:102
-#, c-format
+#: ../urpmi:101
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpmi:104
-#, c-format
+#: ../urpmi:103
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi:107
-#, c-format
+#: ../urpmi:106
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr ""
 
-#: ../urpmi:108
-#, c-format
+#: ../urpmi:107
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi:110 ../urpmi.addmedia:44 ../urpmi.update:31 ../urpmq:68
-#, c-format
+#: ../urpmi:109 ../urpmi.addmedia:44 ../urpmi.update:31 ../urpmq:68
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi:111 ../urpmi.addmedia:45 ../urpmi.update:32 ../urpmq:69
-#, c-format
+#: ../urpmi:110 ../urpmi.addmedia:45 ../urpmi.update:32 ../urpmq:69
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi:112 ../urpmi.addmedia:46 ../urpmi.update:33
-#, c-format
+#: ../urpmi:111 ../urpmi.addmedia:46 ../urpmi.update:33
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
 
-#: ../urpmi:113
-#, c-format
+#: ../urpmi:112
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
 
-#: ../urpmi:115 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:70
-#, c-format
+#: ../urpmi:114 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:70
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 
-#: ../urpmi:117 ../urpmi.addmedia:49 ../urpmi.update:36 ../urpmq:72
-#, c-format
+#: ../urpmi:116 ../urpmi.addmedia:49 ../urpmi.update:36 ../urpmq:72
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
 msgstr ""
 
-#: ../urpmi:119
-#, c-format
+#: ../urpmi:118
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
 msgstr ""
 
-#: ../urpmi:122
-#, c-format
+#: ../urpmi:121
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../urpmi:124
-#, c-format
+#: ../urpmi:123
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 
-#: ../urpmi:125
-#, c-format
+#: ../urpmi:124
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 
-#: ../urpmi:126
-#, c-format
+#: ../urpmi:125
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr ""
 
-#: ../urpmi:127
-#, c-format
+#: ../urpmi:126
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr ""
 
-#: ../urpmi:128
-#, c-format
+#: ../urpmi:127
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr ""
 
-#: ../urpmi:129
-#, c-format
+#: ../urpmi:128
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
 msgstr ""
 
-#: ../urpmi:131 ../urpmi.addmedia:68 ../urpmi.update:41
-#, c-format
+#: ../urpmi:130 ../urpmi.addmedia:68 ../urpmi.update:41
 msgid "  --norebuild    - don't try to rebuild hdlist if not readable.\n"
 msgstr ""
 
-#: ../urpmi:132
-#, c-format
+#: ../urpmi:131
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr ""
 
-#: ../urpmi:133 ../urpmq:77
-#, c-format
+#: ../urpmi:132 ../urpmq:77
 msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: ../urpmi:134
-#, c-format
+#: ../urpmi:133
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi:135
-#, c-format
+#: ../urpmi:134
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi:136 ../urpmq:92
-#, c-format
+#: ../urpmi:135 ../urpmq:92
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 
-#: ../urpmi:137 ../urpmq:89
-#, c-format
+#: ../urpmi:136 ../urpmq:89
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 
-#: ../urpmi:138 ../urpmi.addmedia:73 ../urpmi.removemedia:52
+#: ../urpmi:137 ../urpmi.addmedia:73 ../urpmi.removemedia:52
 #: ../urpmi.update:47
-#, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: ../urpmi:140
-#, c-format
+#: ../urpmi:139
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpmi:187
-#, c-format
+#: ../urpmi:188
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 
-#: ../urpmi:206
+#: ../urpmi:207
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr ""
 
-#: ../urpmi:207
+#: ../urpmi:208
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr ""
 
-#: ../urpmi:210 ../urpmi:331
-#, c-format
+#: ../urpmi:211 ../urpmi:332
 msgid "Copying failed"
 msgstr ""
 
-#: ../urpmi:236
+#: ../urpmi:237
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
 "Use --allow-force to force operation."
 msgstr ""
 
-#: ../urpmi:366
+#: ../urpmi:367
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr ""
 
-#: ../urpmi:396
+#: ../urpmi:397
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -1655,21 +1589,24 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../urpmi:404 ../urpmi:422
-#, c-format
+#: ../urpmi:405 ../urpmi:423
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr ""
 
-#: ../urpmi:415
+#: ../urpmi:405 ../urpmi:423 ../urpmi:503
+msgid " (Y/n) "
+msgstr ""
+
+#: ../urpmi:416
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: ../urpmi:445
+#: ../urpmi:446
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1677,96 +1614,97 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../urpmi:450
+#: ../urpmi:451
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
 msgstr ""
 
-#: ../urpmi:485 ../urpmi:496
+#: ../urpmi:486 ../urpmi:497
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be installed "
 "(%d MB)"
 msgstr ""
 
-#: ../urpmi:486 ../urpmi:497
+#: ../urpmi:487 ../urpmi:498
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed (%d "
 "MB)"
 msgstr ""
 
-#: ../urpmi:492
+#: ../urpmi:493
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
 "%s\n"
 msgstr ""
 
-#: ../urpmi:523
-#, c-format
+#: ../urpmi:524
 msgid "Press Enter when ready..."
 msgstr ""
 
-#: ../urpmi:577
-#, c-format
-msgid "The following packages have bad signatures"
+#: ../urpmi:530
+msgid "Cancel"
+msgstr ""
+
+#: ../urpmi:530
+msgid "Ok"
 msgstr ""
 
 #: ../urpmi:578
-#, c-format
+msgid "The following packages have bad signatures"
+msgstr ""
+
+#: ../urpmi:579
 msgid "Do you want to continue installation ?"
 msgstr ""
 
-#: ../urpmi:620
+#: ../urpmi:621
 #, c-format
 msgid "distributing %s"
 msgstr ""
 
-#: ../urpmi:631
+#. - there's a common prefix, simplify message
+#: ../urpmi:632
 #, c-format
 msgid "installing %s from %s"
 msgstr ""
 
-#: ../urpmi:633
+#: ../urpmi:634
 #, c-format
 msgid "installing %s"
 msgstr ""
 
-#: ../urpmi:662
-#, c-format
+#: ../urpmi:663
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr ""
 
-#: ../urpmi:678
-#, c-format
+#: ../urpmi:679
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr ""
 
-#: ../urpmi:715
+#: ../urpmi:716
 #, c-format
 msgid "%d installation transactions failed"
 msgstr ""
 
-#: ../urpmi:723
-#, c-format
-msgid "Installation is possible"
-msgstr ""
-
-#: ../urpmi:730
+#: ../urpmi:731
 #, c-format
 msgid "The following package names were assumed: %s"
 msgstr ""
 
-#: ../urpmi:747
-#, c-format
+#: ../urpmi:748
 msgid "restarting urpmi"
 msgstr ""
 
+#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
+#. Translator: and 'removable:' must not be translated!
+#. Translator: neither the ``with''.
+#. Translator: only what is between <brackets> can be translated.
 #: ../urpmi.addmedia:34
-#, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
 "where <url> is one of\n"
@@ -1781,29 +1719,24 @@ msgid ""
 msgstr ""
 
 #: ../urpmi.addmedia:51
-#, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr ""
 
 #: ../urpmi.addmedia:52
-#, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
 
 #: ../urpmi.addmedia:53
-#, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr ""
 
 #: ../urpmi.addmedia:54
-#, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
 "                   hdlist file.\n"
 msgstr ""
 
 #: ../urpmi.addmedia:56
-#, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
@@ -1817,7 +1750,6 @@ msgid ""
 msgstr ""
 
 #: ../urpmi.addmedia:60
-#, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
 "                   from the version of the distribution told by the\n"
@@ -1825,41 +1757,34 @@ msgid ""
 msgstr ""
 
 #: ../urpmi.addmedia:63
-#, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
 "                   mandriva-release package installed.\n"
 msgstr ""
 
 #: ../urpmi.addmedia:65
-#, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
 msgstr ""
 
 #: ../urpmi.addmedia:67 ../urpmi.update:39
-#, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
 #: ../urpmi.addmedia:69
-#, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 
 #: ../urpmi.addmedia:70
-#, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 
 #: ../urpmi.addmedia:71 ../urpmi.removemedia:50 ../urpmi.update:45
-#, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
 #: ../urpmi.addmedia:72 ../urpmi.update:46
-#, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
@@ -1869,7 +1794,6 @@ msgid "unable to update medium \"%s\"\n"
 msgstr ""
 
 #: ../urpmi.addmedia:117
-#, c-format
 msgid "Only superuser is allowed to add media"
 msgstr ""
 
@@ -1884,17 +1808,14 @@ msgid "Can't create config file [%s]"
 msgstr ""
 
 #: ../urpmi.addmedia:128
-#, c-format
 msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr ""
 
 #: ../urpmi.addmedia:138
-#, c-format
 msgid "<relative path of hdlist> missing\n"
 msgstr ""
 
 #: ../urpmi.addmedia:140
-#, c-format
 msgid "`with' missing for network media\n"
 msgstr ""
 
@@ -1904,19 +1825,16 @@ msgid "unable to create medium \"%s\"\n"
 msgstr ""
 
 #: ../urpmi.removemedia:46
-#, c-format
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
 "where <name> is a medium name to remove.\n"
 msgstr ""
 
 #: ../urpmi.removemedia:49
-#, c-format
 msgid "  -a             - select all media.\n"
 msgstr ""
 
 #: ../urpmi.removemedia:51
-#, c-format
 msgid "  -y             - fuzzy match on media names.\n"
 msgstr ""
 
@@ -1928,12 +1846,10 @@ msgid ""
 msgstr ""
 
 #: ../urpmi.removemedia:63
-#, c-format
 msgid "Only superuser is allowed to remove media"
 msgstr ""
 
 #: ../urpmi.removemedia:73
-#, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
@@ -1945,44 +1861,36 @@ msgid ""
 msgstr ""
 
 #: ../urpmi.update:28
-#, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
 msgstr ""
 
 #: ../urpmi.update:38
-#, c-format
 msgid "  --update       - update only update media.\n"
 msgstr ""
 
 #: ../urpmi.update:40
-#, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr ""
 
 #: ../urpmi.update:42
-#, c-format
 msgid "  --ignore       - don't update, mark the media as ignored.\n"
 msgstr ""
 
 #: ../urpmi.update:43
-#, c-format
 msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
 msgstr ""
 
 #: ../urpmi.update:44
-#, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
 #: ../urpmi.update:67
-#, c-format
 msgid "Only superuser is allowed to update media"
 msgstr ""
 
 #: ../urpmi.update:75
-#, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
@@ -2000,12 +1908,12 @@ msgstr ""
 
 #: ../urpmi.update:98
 #, c-format
-msgid "ignoring media %s"
+msgid "enabling media %s"
 msgstr ""
 
 #: ../urpmi.update:98
 #, c-format
-msgid "enabling media %s"
+msgid "ignoring media %s"
 msgstr ""
 
 #: ../urpmq:38
@@ -2020,151 +1928,124 @@ msgid ""
 msgstr ""
 
 #: ../urpmq:54
-#, c-format
 msgid "  --list         - list available packages.\n"
 msgstr ""
 
 #: ../urpmq:55
-#, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr ""
 
 #: ../urpmq:56
-#, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr ""
 
 #: ../urpmq:57
-#, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 
 #: ../urpmq:58
-#, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr ""
 
 #: ../urpmq:59
-#, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
 #: ../urpmq:61
-#, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
 msgstr ""
 
 #: ../urpmq:63
-#, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
 #: ../urpmq:66
-#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
 msgstr ""
 
 #: ../urpmq:75
-#, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr ""
 
 #: ../urpmq:76
-#, c-format
 msgid "  --summary, -S  - print summary.\n"
 msgstr ""
 
 #: ../urpmq:78
-#, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 
 #: ../urpmq:79
-#, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
 #: ../urpmq:81
-#, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr ""
 
 #: ../urpmq:82
-#, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 
 #: ../urpmq:83
-#, c-format
 msgid "  -l             - list files in package.\n"
 msgstr ""
 
 #: ../urpmq:84
-#, c-format
 msgid ""
 "  -P             - do not search in provides to find package (default).\n"
 msgstr ""
 
 #: ../urpmq:85
-#, c-format
 msgid "  -p             - search in provides to find package.\n"
 msgstr ""
 
 #: ../urpmq:86
-#, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr ""
 
 #: ../urpmq:87
-#, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 
 #: ../urpmq:88
-#, c-format
 msgid ""
 "  -RR            - extended reverse search (includes virtual packages).\n"
 msgstr ""
 
 #: ../urpmq:90
-#, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr ""
 
 #: ../urpmq:93
-#, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr ""
 
 #: ../urpmq:94
-#, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: ../urpmq:156
-#, c-format
+#: ../urpmq:157
 msgid "--list-nodes can only be used with --parallel"
 msgstr ""
 
-#: ../urpmq:343
+#: ../urpmq:351
 #, c-format
 msgid "skipping media %s: no hdlist"
 msgstr ""
 
-#: ../urpmq:414
-#, c-format
+#: ../urpmq:426
 msgid "No filelist found\n"
 msgstr ""
 
-#: ../urpmq:424
-#, c-format
+#: ../urpmq:438
 msgid "No changelog found\n"
 msgstr ""