sync with code

1 files changed, 476 insertions, 410 deletions

diff --git a/po/urpmi.pot b/po/urpmi.pot
index 67793f69..d62efb37 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-02-14 13:05+0100\n"
+"POT-Creation-Date: 2008-02-25 11:14+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"
@@ -115,7 +115,7 @@ msgstr ""
 msgid "Warning"
 msgstr ""
 
-#: ../gurpmi2:114 ../urpmi:625
+#: ../gurpmi2:114 ../urpmi:626
 #, c-format
 msgid "Ok"
 msgstr ""
@@ -153,13 +153,13 @@ msgid ""
 "Continue installation anyway?"
 msgstr ""
 
-#: ../gurpmi2:215 ../urpmi:591
+#: ../gurpmi2:215 ../urpmi:592
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr ""
 
-#: ../gurpmi2:216 ../urpmi:592
+#: ../gurpmi2:216 ../urpmi:593
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -192,7 +192,7 @@ msgstr ""
 msgid "Installing package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../gurpmi2:260 ../urpmi:619
+#: ../gurpmi2:260 ../urpmi:620
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
@@ -268,7 +268,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 ""
@@ -278,68 +278,68 @@ msgstr ""
 msgid "Running urpmi in restricted mode..."
 msgstr ""
 
-#: ../urpm.pm:108
+#: ../urpm.pm:110
 #, c-format
 msgid "fail to create directory %s"
 msgstr ""
 
-#: ../urpm.pm:109
+#: ../urpm.pm:111
 #, c-format
 msgid "invalid owner for directory %s"
 msgstr ""
 
-#: ../urpm.pm:208
+#: ../urpm.pm:210
 #, c-format
 msgid "unable to open rpmdb"
 msgstr ""
 
-#: ../urpm.pm:222
+#: ../urpm.pm:224
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr ""
 
-#: ../urpm.pm:228
+#: ../urpm.pm:230
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr ""
 
-#: ../urpm.pm:230 ../urpm/get_pkgs.pm:158
+#: ../urpm.pm:232 ../urpm/get_pkgs.pm:160
 #, c-format
 msgid "...retrieving done"
 msgstr ""
 
-#: ../urpm.pm:233 ../urpm/download.pm:686 ../urpm/get_pkgs.pm:160
-#: ../urpm/media.pm:742 ../urpm/media.pm:1144 ../urpm/media.pm:1320
+#: ../urpm.pm:235 ../urpm/download.pm:691 ../urpm/get_pkgs.pm:162
+#: ../urpm/media.pm:771 ../urpm/media.pm:1199 ../urpm/media.pm:1375
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr ""
 
-#: ../urpm.pm:238
+#: ../urpm.pm:240
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: ../urpm.pm:243
+#: ../urpm.pm:245
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr ""
 
-#: ../urpm.pm:251
+#: ../urpm.pm:253
 #, c-format
 msgid "unable to register rpm file"
 msgstr ""
 
-#: ../urpm.pm:253
+#: ../urpm.pm:255
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:257
+#: ../urpm.pm:259
 #, c-format
 msgid "error registering local packages"
 msgstr ""
 
-#: ../urpm.pm:355
+#: ../urpm.pm:357
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
@@ -354,32 +354,32 @@ msgstr ""
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr ""
 
-#: ../urpm/args.pm:352
+#: ../urpm/args.pm:353
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:418
+#: ../urpm/args.pm:419
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:437
+#: ../urpm/args.pm:438
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:440 ../urpm/args.pm:443
+#: ../urpm/args.pm:441 ../urpm/args.pm:444
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:451
+#: ../urpm/args.pm:452
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
 
-#: ../urpm/bug_report.pm:48 ../urpmi:246
+#: ../urpm/bug_report.pm:48 ../urpmi:247
 #, c-format
 msgid "Copying failed"
 msgstr ""
@@ -399,7 +399,7 @@ msgstr ""
 msgid "medium `%s' is defined twice, aborting"
 msgstr ""
 
-#: ../urpm/cfg.pm:248 ../urpm/media.pm:443 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:250 ../urpm/media.pm:450 ../urpm/media.pm:456
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr ""
@@ -434,87 +434,87 @@ msgstr ""
 msgid "%s failed: exited with %d"
 msgstr ""
 
-#: ../urpm/download.pm:229
+#: ../urpm/download.pm:234
 #, c-format
 msgid "copy failed"
 msgstr ""
 
-#: ../urpm/download.pm:235
+#: ../urpm/download.pm:240
 #, c-format
 msgid "wget is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:300
+#: ../urpm/download.pm:305
 #, c-format
 msgid "curl is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:425
+#: ../urpm/download.pm:430
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr ""
 
-#: ../urpm/download.pm:464
+#: ../urpm/download.pm:469
 #, c-format
 msgid "rsync is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:530
+#: ../urpm/download.pm:535
 #, c-format
 msgid "ssh is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:549
+#: ../urpm/download.pm:554
 #, c-format
 msgid "prozilla is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:565
+#: ../urpm/download.pm:570
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr ""
 
-#: ../urpm/download.pm:573
+#: ../urpm/download.pm:578
 #, c-format
 msgid "aria2 is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:676
+#: ../urpm/download.pm:681
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:678
+#: ../urpm/download.pm:683
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:735
+#: ../urpm/download.pm:740
 #, c-format
 msgid "retrieving %s"
 msgstr ""
 
-#: ../urpm/download.pm:739
+#: ../urpm/download.pm:744
 #, c-format
 msgid "retrieved %s"
 msgstr ""
 
-#: ../urpm/download.pm:752
+#: ../urpm/download.pm:772
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr ""
 
-#: ../urpm/download.pm:772
+#: ../urpm/download.pm:792
 #, c-format
 msgid "%s is not available, falling back on %s"
 msgstr ""
 
-#: ../urpm/download.pm:776
+#: ../urpm/download.pm:796
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpm/download.pm:797
+#: ../urpm/download.pm:817
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr ""
@@ -529,17 +529,17 @@ msgstr ""
 msgid "package %s is not found."
 msgstr ""
 
-#: ../urpm/get_pkgs.pm:134
+#: ../urpm/get_pkgs.pm:136
 #, c-format
 msgid "malformed URL: [%s]"
 msgstr ""
 
-#: ../urpm/get_pkgs.pm:147
+#: ../urpm/get_pkgs.pm:149
 #, c-format
 msgid "sorry, you can't use --install-src to install remote .src.rpm files"
 msgstr ""
 
-#: ../urpm/get_pkgs.pm:154
+#: ../urpm/get_pkgs.pm:156
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr ""
@@ -560,32 +560,42 @@ msgstr ""
 msgid "unable to create transaction"
 msgstr ""
 
-#: ../urpm/install.pm:179
+#: ../urpm/install.pm:180
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr ""
 
-#: ../urpm/install.pm:190
+#: ../urpm/install.pm:193
 #, c-format
 msgid "unable to install package %s"
 msgstr ""
 
-#: ../urpm/install.pm:227
+#: ../urpm/install.pm:196
+#, c-format
+msgid "removing bad rpm (%s) from %s"
+msgstr ""
+
+#: ../urpm/install.pm:197 ../urpm/install.pm:254
+#, c-format
+msgid "removing %s failed: %s"
+msgstr ""
+
+#: ../urpm/install.pm:235
 #, c-format
 msgid "Removing package %s"
 msgstr ""
 
-#: ../urpm/install.pm:228
+#: ../urpm/install.pm:236
 #, c-format
 msgid "removing package %s"
 msgstr ""
 
-#: ../urpm/install.pm:243
+#: ../urpm/install.pm:252
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr ""
 
-#: ../urpm/install.pm:249
+#: ../urpm/install.pm:260
 #, c-format
 msgid "More information on package %s"
 msgstr ""
@@ -682,37 +692,44 @@ msgstr ""
 
 #: ../urpm/main_loop.pm:264
 #, c-format
+msgid ""
+"Installation failed, bad rpms:\n"
+"%s"
+msgstr ""
+
+#: ../urpm/main_loop.pm:270
+#, c-format
 msgid "%d installation transaction failed"
 msgid_plural "%d installation transactions failed"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../urpm/main_loop.pm:275
+#: ../urpm/main_loop.pm:281
 #, c-format
 msgid "Installation is possible"
 msgstr ""
 
-#: ../urpm/main_loop.pm:280
+#: ../urpm/main_loop.pm:286
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpm/main_loop.pm:288
+#: ../urpm/main_loop.pm:294
 #, c-format
 msgid "Package %s is already installed"
 msgstr ""
 
-#: ../urpm/main_loop.pm:289
+#: ../urpm/main_loop.pm:295
 #, c-format
 msgid "Packages %s are already installed"
 msgstr ""
 
-#: ../urpm/main_loop.pm:292
+#: ../urpm/main_loop.pm:298
 #, c-format
 msgid "Package %s can not be installed"
 msgstr ""
 
-#: ../urpm/main_loop.pm:293
+#: ../urpm/main_loop.pm:299
 #, c-format
 msgid "Packages %s can not be installed"
 msgstr ""
@@ -727,229 +744,229 @@ msgstr ""
 msgid "warning: md5sum for %s unavailable in MD5SUM file"
 msgstr ""
 
-#: ../urpm/media.pm:185
+#: ../urpm/media.pm:187
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr ""
 
-#: ../urpm/media.pm:187
+#: ../urpm/media.pm:189
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm/media.pm:194
+#: ../urpm/media.pm:196
 #, c-format
 msgid "unable to access synthesis file of \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm/media.pm:221
+#: ../urpm/media.pm:223
 #, c-format
 msgid "trying to override existing medium \"%s\", skipping"
 msgstr ""
 
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:409
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:403
+#: ../urpm/media.pm:410
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:406
+#: ../urpm/media.pm:413
 #, c-format
 msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
 msgstr ""
 
-#: ../urpm/media.pm:409
+#: ../urpm/media.pm:416
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:414 ../urpm/media.pm:417
+#: ../urpm/media.pm:421 ../urpm/media.pm:424
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:445 ../urpm/media.pm:451
+#: ../urpm/media.pm:452 ../urpm/media.pm:458
 #, c-format
 msgid "wrote config file [%s]"
 msgstr ""
 
-#: ../urpm/media.pm:494
+#: ../urpm/media.pm:501
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 
-#: ../urpm/media.pm:502
+#: ../urpm/media.pm:509
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr ""
 
-#: ../urpm/media.pm:518
+#: ../urpm/media.pm:525
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
 "update, --use-distrib or --parallel"
 msgstr ""
 
-#: ../urpm/media.pm:602
+#: ../urpm/media.pm:612
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr ""
 
-#: ../urpm/media.pm:617
+#: ../urpm/media.pm:627
 #, c-format
 msgid "skipping package %s"
 msgstr ""
 
-#: ../urpm/media.pm:633
+#: ../urpm/media.pm:643
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr ""
 
-#: ../urpm/media.pm:658
+#: ../urpm/media.pm:668
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: ../urpm/media.pm:686
+#: ../urpm/media.pm:710
 #, c-format
 msgid "(ignored by default)"
 msgstr ""
 
-#: ../urpm/media.pm:692
+#: ../urpm/media.pm:716
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:698
+#: ../urpm/media.pm:722
 #, c-format
 msgid "adding medium \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:725
+#: ../urpm/media.pm:750
 #, c-format
 msgid "unable to mount the distribution medium"
 msgstr ""
 
-#: ../urpm/media.pm:728
+#: ../urpm/media.pm:753
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr ""
 
-#: ../urpm/media.pm:735
-#, c-format
-msgid "retrieving media.cfg file..."
-msgstr ""
-
-#: ../urpm/media.pm:740
+#: ../urpm/media.pm:769
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr ""
 
-#: ../urpm/media.pm:743
+#: ../urpm/media.pm:772
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr ""
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:790
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:839
+#, c-format
+msgid "retrieving media.cfg file..."
+msgstr ""
+
+#: ../urpm/media.pm:880
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:840
+#: ../urpm/media.pm:883
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr ""
 
-#: ../urpm/media.pm:860
+#: ../urpm/media.pm:903
 #, c-format
 msgid "removing medium \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:926
+#: ../urpm/media.pm:979
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:964
+#: ../urpm/media.pm:1017
 #, c-format
 msgid "...reconfiguration failed"
 msgstr ""
 
-#: ../urpm/media.pm:970
+#: ../urpm/media.pm:1023
 #, c-format
 msgid "reconfiguration done"
 msgstr ""
 
-#: ../urpm/media.pm:991
+#: ../urpm/media.pm:1044
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr ""
 
-#: ../urpm/media.pm:1002
+#: ../urpm/media.pm:1055
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr ""
 
-#: ../urpm/media.pm:1022
+#: ../urpm/media.pm:1075
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:1035 ../urpm/media.pm:1117
+#: ../urpm/media.pm:1088 ../urpm/media.pm:1171
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr ""
 
-#: ../urpm/media.pm:1037 ../urpm/media.pm:1092 ../urpm/media.pm:1336
+#: ../urpm/media.pm:1090 ../urpm/media.pm:1145 ../urpm/media.pm:1391
 #, c-format
 msgid "...copying failed"
 msgstr ""
 
-#: ../urpm/media.pm:1088
+#: ../urpm/media.pm:1141
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr ""
 
-#: ../urpm/media.pm:1090 ../urpm/media.pm:1121
+#: ../urpm/media.pm:1143 ../urpm/media.pm:1175
 #, c-format
 msgid "...copying done"
 msgstr ""
 
-#: ../urpm/media.pm:1123
+#: ../urpm/media.pm:1177
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
 
-#: ../urpm/media.pm:1155
+#: ../urpm/media.pm:1210
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr ""
 
-#: ../urpm/media.pm:1157 ../urpm/media.pm:1572
+#: ../urpm/media.pm:1212 ../urpm/media.pm:1629
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr ""
 
-#: ../urpm/media.pm:1172
+#: ../urpm/media.pm:1227
 #, c-format
 msgid "genhdlist2 failed on %s"
 msgstr ""
 
-#: ../urpm/media.pm:1182
+#: ../urpm/media.pm:1237
 #, c-format
 msgid "comparing %s and %s"
 msgstr ""
 
-#: ../urpm/media.pm:1202
+#: ../urpm/media.pm:1257
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -957,64 +974,84 @@ msgid ""
 "medium."
 msgstr ""
 
-#: ../urpm/media.pm:1215
+#: ../urpm/media.pm:1270
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:1241
+#: ../urpm/media.pm:1296
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr ""
 
-#: ../urpm/media.pm:1295
+#: ../urpm/media.pm:1350
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr ""
 
-#: ../urpm/media.pm:1312
+#: ../urpm/media.pm:1367
 #, c-format
 msgid "found probed synthesis as %s"
 msgstr ""
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1425
+#: ../urpm/media.pm:1374 ../urpm/media.pm:1482
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1425
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr ""
 
-#: ../urpm/media.pm:1382
+#: ../urpm/media.pm:1437
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:1386
+#: ../urpm/media.pm:1441
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:1455
+#: ../urpm/media.pm:1512
 #, c-format
 msgid "updated medium \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:1566
+#: ../urpm/media.pm:1623
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
 
-#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:521 ../urpmi:610
+#: ../urpm/mirrors.pm:19
+#, c-format
+msgid "trying again with mirror %s"
+msgstr ""
+
+#: ../urpm/mirrors.pm:60
+#, c-format
+msgid "Could not find a mirror from mirrorlist %s"
+msgstr ""
+
+#: ../urpm/mirrors.pm:133
+#, c-format
+msgid "found geolocalisation %s %.2f %.2f from timezone %s"
+msgstr ""
+
+#: ../urpm/mirrors.pm:178
+#, c-format
+msgid "getting mirror list from %s"
+msgstr ""
+
+#: ../urpm/msg.pm:62 ../urpmi:506 ../urpmi:522 ../urpmi:611
 #, 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:506 ../urpmi:522 ../urpmi:561
-#: ../urpmi:611 ../urpmi:641 ../urpmi:647 ../urpmi.addmedia:122
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:507 ../urpmi:523 ../urpmi:562
+#: ../urpmi:612 ../urpmi:642 ../urpmi:648 ../urpmi.addmedia:139
 #, c-format
 msgid "Yy"
 msgstr ""
@@ -1134,499 +1171,506 @@ msgstr ""
 msgid "unable to access medium \"%s\""
 msgstr ""
 
-#: ../urpm/select.pm:21
+#: ../urpm/search.pm:29 ../urpmf:29
 #, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2006 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage: urpmf [options] pattern-expression\n"
 msgstr ""
 
-#: ../urpm/select.pm:23
+#: ../urpm/search.pm:35 ../urpme:45 ../urpmf:35 ../urpmi:74
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgid "  --help         - print this help message.\n"
 msgstr ""
 
-#: ../urpm/select.pm:184
+#: ../urpm/search.pm:36 ../urpmf:36
 #, c-format
-msgid "No package named %s"
+msgid "  --version      - print this tool's version number.\n"
 msgstr ""
 
-#: ../urpm/select.pm:186 ../urpme:107
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:131 ../urpmq:79
 #, c-format
-msgid "The following packages contain %s: %s"
+msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 
-#: ../urpm/select.pm:495 ../urpm/select.pm:538
+#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:76 ../urpmq:49
 #, c-format
-msgid "due to missing %s"
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpm/select.pm:496
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
-msgid "due to already installed %s"
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpm/select.pm:497 ../urpm/select.pm:536
+#: ../urpm/search.pm:40 ../urpme:52 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:69 ../urpmi.recover:36 ../urpmi.removemedia:46
+#: ../urpmi.update:46 ../urpmq:69
 #, c-format
-msgid "due to unsatisfied %s"
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
 msgstr ""
 
-#: ../urpm/select.pm:503
+#: ../urpm/search.pm:41 ../urpmf:41 ../urpmi:75 ../urpmq:47
 #, c-format
-msgid "trying to promote %s"
+msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpm/select.pm:504
+#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
 #, c-format
-msgid "in order to keep %s"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 
-#: ../urpm/select.pm:532
+#: ../urpm/search.pm:43 ../urpmf:43
 #, c-format
-msgid "in order to install %s"
+msgid "  --use-distrib  - use the given path to access media\n"
 msgstr ""
 
-#: ../urpm/select.pm:542
+#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:80 ../urpmq:51
 #, c-format
-msgid "due to conflicts with %s"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpm/signature.pm:29
+#: ../urpm/search.pm:45 ../urpmf:45
 #, c-format
-msgid "Invalid signature (%s)"
+msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr ""
 
-#: ../urpm/signature.pm:60
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:77 ../urpmq:46
 #, c-format
-msgid "Invalid Key ID (%s)"
+msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: ../urpm/signature.pm:62
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
-msgid "Missing signature (%s)"
+msgid "  --verbose      - verbose mode.\n"
 msgstr ""
 
-#: ../urpm/sys.pm:221
+#: ../urpm/search.pm:48 ../urpmf:48
 #, c-format
-msgid "Can't write file"
+msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr ""
 
-#: ../urpm/sys.pm:221
+#: ../urpm/search.pm:49 ../urpmf:49
 #, c-format
-msgid "Can't open file"
+msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr ""
 
-#: ../urpme:40
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
-#: ../urpme:45 ../urpmf:35 ../urpmi:74 ../urpmi.addmedia:45
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
-msgid "  --help         - print this help message.\n"
+msgid "Pattern expressions:\n"
 msgstr ""
 
-#: ../urpme:46
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
-#: ../urpme:47
+#: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
+#: ../urpm/search.pm:54 ../urpmf:54
 #, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+msgid "  -a             - binary AND operator.\n"
 msgstr ""
 
-#: ../urpme:49 ../urpmi:109 ../urpmq:67
+#: ../urpm/search.pm:55 ../urpmf:55
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgid "  -o             - binary OR operator.\n"
 msgstr ""
 
-#: ../urpme:50 ../urpmi:140
+#: ../urpm/search.pm:56 ../urpmf:56
 #, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
+msgid "  !              - unary NOT.\n"
 msgstr ""
 
-#: ../urpme:51
+#: ../urpm/search.pm:57 ../urpmf:57
 #, c-format
-msgid "  --root         - use another root for rpm removal.\n"
+msgid "  ( )            - left and right parentheses.\n"
 msgstr ""
 
-#: ../urpme:52 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:60
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:69
+#: ../urpm/search.pm:58 ../urpmf:58
 #, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgid "List of tags:\n"
 msgstr ""
 
-#: ../urpme:53
+#: ../urpm/search.pm:59 ../urpmf:59
 #, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgid "  --qf           - specify a printf-like output format\n"
 msgstr ""
 
-#: ../urpme:54
+#: ../urpm/search.pm:60 ../urpmf:60
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+msgid "                   example: '%%name:%%files'\n"
 msgstr ""
 
-#: ../urpme:56 ../urpmi:151 ../urpmq:84
+#: ../urpm/search.pm:61 ../urpmf:61
 #, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
+msgid "  --arch         - architecture\n"
 msgstr ""
 
-#: ../urpme:57
+#: ../urpm/search.pm:62 ../urpmf:62
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
+msgid "  --buildhost    - build host\n"
 msgstr ""
 
-#: ../urpme:70
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
-msgid "Only superuser is allowed to remove packages"
+msgid "  --buildtime    - build time\n"
 msgstr ""
 
-#: ../urpme:100
+#: ../urpm/search.pm:64 ../urpmf:64
 #, c-format
-msgid "unknown packages"
+msgid "  --conffiles    - configuration files\n"
 msgstr ""
 
-#: ../urpme:100
+#: ../urpm/search.pm:65 ../urpmf:65
 #, c-format
-msgid "unknown package"
+msgid "  --conflicts    - conflict tags\n"
 msgstr ""
 
-#: ../urpme:113 ../urpmi:535
+#: ../urpm/search.pm:66 ../urpmf:66
 #, c-format
-msgid "removing package %s will break your system"
+msgid "  --description  - package description\n"
 msgstr ""
 
-#: ../urpme:115
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
-msgid "Nothing to remove"
+msgid "  --distribution - distribution\n"
 msgstr ""
 
-#: ../urpme:120
+#: ../urpm/search.pm:68 ../urpmf:68
 #, c-format
-msgid "Checking to remove the following packages"
+msgid "  --epoch        - epoch\n"
 msgstr ""
 
-#: ../urpme:124
+#: ../urpm/search.pm:69 ../urpmf:69
 #, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural ""
-"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] ""
-msgstr[1] ""
+msgid "  --filename     - filename of the package\n"
+msgstr ""
 
-#: ../urpme:128
+#: ../urpm/search.pm:70 ../urpmf:70
 #, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] ""
-msgstr[1] ""
+msgid "  --files        - list of files contained in the package\n"
+msgstr ""
 
-#: ../urpme:128 ../urpmi:562 ../urpmi:642 ../urpmi.addmedia:125
+#: ../urpm/search.pm:71 ../urpmf:71
 #, c-format
-msgid " (y/N) "
+msgid "  --group        - group\n"
 msgstr ""
 
-#: ../urpme:150
+#: ../urpm/search.pm:72 ../urpmf:72
 #, c-format
-msgid "Removal failed"
+msgid "  --license      - license\n"
 msgstr ""
 
-#: ../urpmf:29
+#: ../urpm/search.pm:73 ../urpmf:73
 #, c-format
-msgid ""
-"urpmf version %s\n"
-"Copyright (C) 2002-2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage: urpmf [options] pattern-expression\n"
+msgid "  --name         - package name\n"
 msgstr ""
 
-#: ../urpmf:36
+#: ../urpm/search.pm:74 ../urpmf:74
 #, c-format
-msgid "  --version      - print this tool's version number.\n"
+msgid "  --obsoletes    - obsoletes tags\n"
 msgstr ""
 
-#: ../urpmf:37 ../urpmi:131 ../urpmq:79
+#: ../urpm/search.pm:75 ../urpmf:75
 #, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
+msgid "  --packager     - packager\n"
 msgstr ""
 
-#: ../urpmf:38 ../urpmi:76 ../urpmq:49
+#: ../urpm/search.pm:76 ../urpmf:76
 #, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgid "  --provides     - provides tags\n"
 msgstr ""
 
-#: ../urpmf:39
+#: ../urpm/search.pm:77 ../urpmf:77
 #, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgid "  --requires     - requires tags\n"
 msgstr ""
 
-#: ../urpmf:41 ../urpmi:75 ../urpmq:47
+#: ../urpm/search.pm:78 ../urpmf:78
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
+msgid "  --size         - installed size\n"
 msgstr ""
 
-#: ../urpmf:42 ../urpmi:79 ../urpmq:50
+#: ../urpm/search.pm:79 ../urpmf:79
 #, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgid "  --sourcerpm    - source rpm name\n"
 msgstr ""
 
-#: ../urpmf:43
+#: ../urpm/search.pm:80 ../urpmf:80
 #, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
+msgid "  --suggests     - suggests tags\n"
 msgstr ""
 
-#: ../urpmf:44 ../urpmi:80 ../urpmq:51
+#: ../urpm/search.pm:81 ../urpmf:81
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgid "  --summary      - summary\n"
 msgstr ""
 
-#: ../urpmf:45
+#: ../urpm/search.pm:82 ../urpmf:82
 #, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
+msgid "  --url          - url\n"
 msgstr ""
 
-#: ../urpmf:46 ../urpmi:77 ../urpmq:46
+#: ../urpm/search.pm:83 ../urpmf:83
 #, c-format
-msgid "  --update       - use only update media.\n"
+msgid "  --vendor       - vendor\n"
 msgstr ""
 
-#: ../urpmf:47
+#: ../urpm/search.pm:84 ../urpmf:84
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
+msgid "  -m             - the media in which the package was found\n"
 msgstr ""
 
-#: ../urpmf:48
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:94
 #, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: ../urpmf:49
+#: ../urpm/search.pm:197 ../urpmf:197
 #, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:50
+#: ../urpm/search.pm:247 ../urpmf:247 ../urpmi:254 ../urpmq:136
 #, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpm/search.pm:290 ../urpmf:290
 #, c-format
-msgid "Pattern expressions:\n"
+msgid "no hdlist available for medium \"%s\""
 msgstr ""
 
-#: ../urpmf:52
+#: ../urpm/search.pm:297 ../urpmf:297
 #, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgid "no synthesis available for medium \"%s\""
 msgstr ""
 
-#: ../urpmf:53
+#: ../urpm/search.pm:304 ../urpmf:306
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
+msgid "no xml-info available for medium \"%s\""
 msgstr ""
 
-#: ../urpmf:54
+#: ../urpm/select.pm:21
 #, c-format
-msgid "  -a             - binary AND operator.\n"
+msgid "urpmi was restarted, and the list of priority packages did not change"
 msgstr ""
 
-#: ../urpmf:55
+#: ../urpm/select.pm:23
 #, c-format
-msgid "  -o             - binary OR operator.\n"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
 msgstr ""
 
-#: ../urpmf:56
+#: ../urpm/select.pm:184
 #, c-format
-msgid "  !              - unary NOT.\n"
+msgid "No package named %s"
 msgstr ""
 
-#: ../urpmf:57
+#: ../urpm/select.pm:186 ../urpme:107
 #, c-format
-msgid "  ( )            - left and right parentheses.\n"
+msgid "The following packages contain %s: %s"
 msgstr ""
 
-#: ../urpmf:58
+#: ../urpm/select.pm:495 ../urpm/select.pm:538
 #, c-format
-msgid "List of tags:\n"
+msgid "due to missing %s"
 msgstr ""
 
-#: ../urpmf:59
+#: ../urpm/select.pm:496
 #, c-format
-msgid "  --qf           - specify a printf-like output format\n"
+msgid "due to already installed %s"
 msgstr ""
 
-#: ../urpmf:60
+#: ../urpm/select.pm:497 ../urpm/select.pm:536
 #, c-format
-msgid "                   example: '%%name:%%files'\n"
+msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpmf:61
+#: ../urpm/select.pm:503
 #, c-format
-msgid "  --arch         - architecture\n"
+msgid "trying to promote %s"
 msgstr ""
 
-#: ../urpmf:62
+#: ../urpm/select.pm:504
 #, c-format
-msgid "  --buildhost    - build host\n"
+msgid "in order to keep %s"
 msgstr ""
 
-#: ../urpmf:63
+#: ../urpm/select.pm:532
 #, c-format
-msgid "  --buildtime    - build time\n"
+msgid "in order to install %s"
 msgstr ""
 
-#: ../urpmf:64
+#: ../urpm/select.pm:542
 #, c-format
-msgid "  --conffiles    - configuration files\n"
+msgid "due to conflicts with %s"
 msgstr ""
 
-#: ../urpmf:65
+#: ../urpm/signature.pm:29
 #, c-format
-msgid "  --conflicts    - conflict tags\n"
+msgid "Invalid signature (%s)"
 msgstr ""
 
-#: ../urpmf:66
+#: ../urpm/signature.pm:60
 #, c-format
-msgid "  --description  - package description\n"
+msgid "Invalid Key ID (%s)"
 msgstr ""
 
-#: ../urpmf:67
+#: ../urpm/signature.pm:62
 #, c-format
-msgid "  --distribution - distribution\n"
+msgid "Missing signature (%s)"
 msgstr ""
 
-#: ../urpmf:68
+#: ../urpm/sys.pm:221
 #, c-format
-msgid "  --epoch        - epoch\n"
+msgid "Can't write file"
 msgstr ""
 
-#: ../urpmf:69
+#: ../urpm/sys.pm:221
 #, c-format
-msgid "  --filename     - filename of the package\n"
+msgid "Can't open file"
 msgstr ""
 
-#: ../urpmf:70
+#: ../urpm/sys.pm:234
 #, c-format
-msgid "  --files        - list of files contained in the package\n"
+msgid "Can't move file %s to %s"
 msgstr ""
 
-#: ../urpmf:71
+#: ../urpme:40
 #, c-format
-msgid "  --group        - group\n"
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2006 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
 
-#: ../urpmf:72
+#: ../urpme:46
 #, c-format
-msgid "  --license      - license\n"
+msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 
-#: ../urpmf:73
+#: ../urpme:47
 #, c-format
-msgid "  --name         - package name\n"
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr ""
 
-#: ../urpmf:74
+#: ../urpme:48 ../urpmi:104 ../urpmq:65
 #, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: ../urpmf:75
+#: ../urpme:49 ../urpmi:109 ../urpmq:67
 #, c-format
-msgid "  --packager     - packager\n"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 
-#: ../urpmf:76
+#: ../urpme:50 ../urpmi:140
 #, c-format
-msgid "  --provides     - provides tags\n"
+msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr ""
 
-#: ../urpmf:77
+#: ../urpme:51
 #, c-format
-msgid "  --requires     - requires tags\n"
+msgid "  --root         - use another root for rpm removal.\n"
 msgstr ""
 
-#: ../urpmf:78
+#: ../urpme:53
 #, c-format
-msgid "  --size         - installed size\n"
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr ""
 
-#: ../urpmf:79
+#: ../urpme:54
 #, c-format
-msgid "  --sourcerpm    - source rpm name\n"
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmf:80
+#: ../urpme:56 ../urpmi:151 ../urpmq:84
 #, c-format
-msgid "  --suggests     - suggests tags\n"
+msgid "  --verbose, -v  - verbose mode.\n"
 msgstr ""
 
-#: ../urpmf:81
+#: ../urpme:57
 #, c-format
-msgid "  --summary      - summary\n"
+msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpmf:82
+#: ../urpme:70
 #, c-format
-msgid "  --url          - url\n"
+msgid "Only superuser is allowed to remove packages"
 msgstr ""
 
-#: ../urpmf:83
+#: ../urpme:100
 #, c-format
-msgid "  --vendor       - vendor\n"
+msgid "unknown packages"
 msgstr ""
 
-#: ../urpmf:84
+#: ../urpme:100
 #, c-format
-msgid "  -m             - the media in which the package was found\n"
+msgid "unknown package"
 msgstr ""
 
-#: ../urpmf:85 ../urpmq:94
+#: ../urpme:113 ../urpmi:536
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
+msgid "removing package %s will break your system"
 msgstr ""
 
-#: ../urpmf:197
+#: ../urpme:115
 #, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
+msgid "Nothing to remove"
 msgstr ""
 
-#: ../urpmf:247 ../urpmi:253 ../urpmq:136
+#: ../urpme:120
 #, c-format
-msgid "using specific environment on %s\n"
+msgid "Checking to remove the following packages"
 msgstr ""
 
-#: ../urpmf:290
+#: ../urpme:124
 #, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr ""
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../urpmf:297
+#: ../urpme:128
 #, c-format
-msgid "no synthesis available for medium \"%s\""
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../urpme:128 ../urpmi:563 ../urpmi:643 ../urpmi.addmedia:142
+#, c-format
+msgid " (y/N) "
 msgstr ""
 
-#: ../urpmf:304
+#: ../urpme:150
 #, c-format
-msgid "no xml-info available for medium \"%s\""
+msgid "Removal failed"
 msgstr ""
 
 #: ../urpmi:69
@@ -1805,7 +1849,7 @@ msgstr ""
 msgid "  --aria2-options - additional options to pass to aria2\n"
 msgstr ""
 
-#: ../urpmi:122 ../urpmi.addmedia:49 ../urpmi.update:36
+#: ../urpmi:122 ../urpmi.addmedia:58 ../urpmi.update:36
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
@@ -1817,14 +1861,14 @@ msgid ""
 "                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
 
-#: ../urpmi:125 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:75
+#: ../urpmi:125 ../urpmi.addmedia:59 ../urpmi.update:37 ../urpmq:75
 #, 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:127 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:77
+#: ../urpmi:127 ../urpmi.addmedia:61 ../urpmi.update:39 ../urpmq:77
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1926,98 +1970,103 @@ msgstr ""
 
 #: ../urpmi:152
 #, c-format
+msgid "  --debug        - very verbose mode.\n"
+msgstr ""
+
+#: ../urpmi:153
+#, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpmi:180
+#: ../urpmi:181
 #, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr ""
 
-#: ../urpmi:187
+#: ../urpmi:188
 #, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
 msgstr ""
 
-#: ../urpmi:214
+#: ../urpmi:215
 #, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr ""
 
-#: ../urpmi:220
+#: ../urpmi:221
 #, c-format
 msgid ""
 "please use --buildrequires or --install-src, defaulting to --buildrequires"
 msgstr ""
 
-#: ../urpmi:240
+#: ../urpmi:241
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr ""
 
-#: ../urpmi:241
+#: ../urpmi:242
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr ""
 
-#: ../urpmi:252
+#: ../urpmi:253
 #, c-format
 msgid "Environment directory %s does not exist"
 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:361
+#: ../urpmi:362
 #, c-format
 msgid "Updating media...\n"
 msgstr ""
 
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:440
+#: ../urpmi:441
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr ""
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:442
+#: ../urpmi:443
 #, c-format
 msgid "%s (to upgrade)"
 msgstr ""
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:446
+#: ../urpmi:447
 #, c-format
 msgid "%s: %s (to install)"
 msgstr ""
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:448
+#: ../urpmi:449
 #, c-format
 msgid "%s (to install)"
 msgstr ""
 
-#: ../urpmi:454
+#: ../urpmi:455
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr ""
 
-#: ../urpmi:457
+#: ../urpmi:458
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr ""
 
-#: ../urpmi:498
+#: ../urpmi:499
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2025,7 +2074,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../urpmi:500
+#: ../urpmi:501
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2033,33 +2082,33 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../urpmi:507 ../urpmi:523
+#: ../urpmi:508 ../urpmi:524
 #, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr ""
 
-#: ../urpmi:508 ../urpmi:524 ../urpmi:612 ../urpmi.addmedia:125
+#: ../urpmi:509 ../urpmi:525 ../urpmi:613 ../urpmi.addmedia:142
 #, c-format
 msgid " (Y/n) "
 msgstr ""
 
-#: ../urpmi:516
+#: ../urpmi:517
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: ../urpmi:517
+#: ../urpmi:518
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: ../urpmi:544
+#: ../urpmi:545
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2067,7 +2116,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../urpmi:546
+#: ../urpmi:547
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2075,26 +2124,26 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../urpmi:553
+#: ../urpmi:554
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
 "%s"
 msgstr ""
 
-#: ../urpmi:554
+#: ../urpmi:555
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
 msgstr ""
 
-#: ../urpmi:556
+#: ../urpmi:557
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:577
+#: ../urpmi:578
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2102,39 +2151,39 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../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 "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../urpmi:620
+#: ../urpmi:621
 #, c-format
 msgid "Press Enter when ready..."
 msgstr ""
 
-#: ../urpmi:625
+#: ../urpmi:626
 #, c-format
 msgid "Cancel"
 msgstr ""
 
-#: ../urpmi:664
+#: ../urpmi:665
 #, c-format
 msgid "restarting urpmi"
 msgstr ""
@@ -2152,30 +2201,39 @@ msgid ""
 "       http://<host>/<path>\n"
 "       removable://<path>\n"
 "\n"
+"usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
+"usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
+"\n"
+"examples:\n"
+"\n"
+"  urpmi.addmedia --distrib --mirrorlist '$MIRRORLIST'\n"
+"  urpmi.addmedia --mirrorlist '$MIRRORLIST' backports media/main/backports\n"
+"\n"
+"\n"
 "and [options] are from\n"
 msgstr ""
 
-#: ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:72
+#: ../urpmi.addmedia:55 ../urpmi.update:33 ../urpmq:72
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:73
+#: ../urpmi.addmedia:56 ../urpmi.update:34 ../urpmq:73
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:74
+#: ../urpmi.addmedia:57 ../urpmi.update:35 ../urpmq:74
 #, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:54
+#: ../urpmi.addmedia:63
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:55
+#: ../urpmi.addmedia:64
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2183,129 +2241,137 @@ msgid ""
 "cfg(5)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:57
+#: ../urpmi.addmedia:66
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:58
+#: ../urpmi.addmedia:67
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr ""
 
-#: ../urpmi.addmedia:59
+#: ../urpmi.addmedia:68
 #, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:72
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:64
+#: ../urpmi.addmedia:73
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:65
+#: ../urpmi.addmedia:74
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr ""
 
-#: ../urpmi.addmedia:67
+#: ../urpmi.addmedia:76
 #, c-format
-msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:69 ../urpmi.update:42
+#: ../urpmi.addmedia:77 ../urpmi.update:42
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:78
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:71
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:49
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:53
+#: ../urpmi.addmedia:82 ../urpmi.removemedia:45 ../urpmi.update:53
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:94
+#: ../urpmi.addmedia:102
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr ""
 
-#: ../urpmi.addmedia:102
+#: ../urpmi.addmedia:113
+#, c-format
+msgid "no argument needed for --distrib --mirrorlist <url>"
+msgstr ""
+
+#: ../urpmi.addmedia:118
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 
-#: ../urpmi.addmedia:105
+#: ../urpmi.addmedia:122
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr ""
 
-#: ../urpmi.addmedia:108
+#: ../urpmi.addmedia:125
 #, c-format
 msgid "creating config file [%s]"
 msgstr ""
 
-#: ../urpmi.addmedia:109
+#: ../urpmi.addmedia:126
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr ""
 
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:134
 #, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr ""
 
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:142
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'"
 msgstr ""
 
-#: ../urpmi.addmedia:150
+#: ../urpmi.addmedia:168
 #, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr ""
 
-#: ../urpmi.addmedia:153
+#: ../urpmi.addmedia:171
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr ""
 
+#: ../urpmi.addmedia:183
+#, c-format
+msgid "unable to add medium"
+msgstr ""
+
 #: ../urpmi.recover:28
 #, c-format
 msgid ""
@@ -2735,29 +2801,29 @@ msgstr ""
 msgid "--list-nodes can only be used with --parallel"
 msgstr ""
 
-#: ../urpmq:358
+#: ../urpmq:360
 #, c-format
 msgid "no xml info for medium \"%s\", only partial result for package %s"
 msgstr ""
 
-#: ../urpmq:359
+#: ../urpmq:361
 #, c-format
 msgid "no xml info for medium \"%s\", only partial result for packages %s"
 msgstr ""
 
-#: ../urpmq:362
+#: ../urpmq:364
 #, c-format
 msgid ""
 "no xml info for medium \"%s\", unable to return any result for package %s"
 msgstr ""
 
-#: ../urpmq:363
+#: ../urpmq:365
 #, c-format
 msgid ""
 "no xml info for medium \"%s\", unable to return any result for packages %s"
 msgstr ""
 
-#: ../urpmq:427
+#: ../urpmq:429
 #, c-format
 msgid "No changelog found\n"
 msgstr ""