sync with code

1 files changed, 382 insertions, 380 deletions

diff --git a/po/urpmi.pot b/po/urpmi.pot
index dbb95af6..d6e573b5 100644
--- a/po/urpmi.pot
+++ b/po/urpmi.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2008-09-01 18:57+0200\n"
+"POT-Creation-Date: 2008-09-04 18:36+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,22 +14,22 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: ../gurpmi:32 ../gurpmi2:75
+#: ../gurpmi:31 ../gurpmi2:74
 #, c-format
 msgid "RPM installation"
 msgstr ""
 
-#: ../gurpmi:46
+#: ../gurpmi:45
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:47 ../gurpmi2:176 ../gurpmi2:200
+#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
 #, c-format
 msgid "_Ok"
 msgstr ""
 
-#: ../gurpmi:67
+#: ../gurpmi:66
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -42,7 +42,7 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../gurpmi:75 ../gurpmi:86
+#: ../gurpmi:74 ../gurpmi:85
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -52,7 +52,7 @@ msgid ""
 "Proceed?"
 msgstr ""
 
-#: ../gurpmi:81
+#: ../gurpmi:80
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -62,22 +62,22 @@ msgid ""
 "You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../gurpmi:99
+#: ../gurpmi:98
 #, c-format
 msgid "_Install"
 msgstr ""
 
-#: ../gurpmi:100
+#: ../gurpmi:99
 #, c-format
 msgid "_Save"
 msgstr ""
 
-#: ../gurpmi:101 ../gurpmi2:176
+#: ../gurpmi:100 ../gurpmi2:175
 #, c-format
 msgid "_Cancel"
 msgstr ""
 
-#: ../gurpmi:109
+#: ../gurpmi:108
 #, c-format
 msgid "Choose location to save file"
 msgstr ""
@@ -98,8 +98,9 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr ""
@@ -130,7 +131,7 @@ msgid ""
 "                   (--no-verify-rpm disables it, default is enabled).\n"
 msgstr ""
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
@@ -168,17 +169,17 @@ msgstr ""
 msgid "No packages specified"
 msgstr ""
 
-#: ../gurpmi2:54
+#: ../gurpmi2:53
 #, c-format
 msgid "Please wait..."
 msgstr ""
 
-#: ../gurpmi2:63
+#: ../gurpmi2:62
 #, c-format
 msgid "Must be root"
 msgstr ""
 
-#: ../gurpmi2:107
+#: ../gurpmi2:106
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -186,42 +187,42 @@ msgid ""
 "Continue installation anyway?"
 msgstr ""
 
-#: ../gurpmi2:135
+#: ../gurpmi2:134
 #, c-format
 msgid "Warning"
 msgstr ""
 
-#: ../gurpmi2:135 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr ""
 
-#: ../gurpmi2:172
+#: ../gurpmi2:171
 #, c-format
 msgid " (to upgrade)"
 msgstr ""
 
-#: ../gurpmi2:173
+#: ../gurpmi2:172
 #, c-format
 msgid " (to install)"
 msgstr ""
 
-#: ../gurpmi2:176
+#: ../gurpmi2:175
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:177
+#: ../gurpmi2:176
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr ""
 
-#: ../gurpmi2:201
+#: ../gurpmi2:200
 #, c-format
 msgid "_Abort"
 msgstr ""
 
-#: ../gurpmi2:223
+#: ../gurpmi2:222
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -229,61 +230,61 @@ msgid ""
 "Continue installation anyway?"
 msgstr ""
 
-#: ../gurpmi2:242 ../urpmi:607
+#: ../gurpmi2:241 ../urpmi:607
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr ""
 
-#: ../gurpmi2:243 ../urpmi:608
+#: ../gurpmi2:242 ../urpmi:608
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr ""
 
-#: ../gurpmi2:245
+#: ../gurpmi2:244
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gurpmi2:251
+#: ../gurpmi2:250
 #, c-format
 msgid "Package installation..."
 msgstr ""
 
-#: ../gurpmi2:253 ../urpm/main_loop.pm:49
+#: ../gurpmi2:252 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: ../gurpmi2:267 ../urpm/install.pm:88
+#: ../gurpmi2:266 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr ""
 
-#: ../gurpmi2:271
+#: ../gurpmi2:270
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../gurpmi2:288 ../urpmi:635
+#: ../gurpmi2:287 ../urpmi:635
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr ""
 
-#: ../gurpmi2:299
+#: ../gurpmi2:298
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr ""
 
-#: ../gurpmi2:325
+#: ../gurpmi2:324
 #, c-format
 msgid "_Done"
 msgstr ""
 
-#: ../gurpmi2:333 ../urpm/main_loop.pm:111
+#: ../gurpmi2:332 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -291,28 +292,28 @@ msgid ""
 "You may want to update your urpmi database"
 msgstr ""
 
-#: ../gurpmi2:339 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, c-format
 msgid "Installation failed:"
 msgstr ""
 
-#: ../gurpmi2:344
+#: ../gurpmi2:343
 #, c-format
 msgid "The package(s) are already installed"
 msgstr ""
 
-#: ../gurpmi2:346
+#: ../gurpmi2:345
 #, c-format
 msgid "Installation finished"
 msgstr ""
 
-#: ../gurpmi2:347 ../urpme:167
+#: ../gurpmi2:346 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr ""
 
-#: ../gurpmi2:355 ../urpmi:702
+#: ../gurpmi2:354 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr ""
@@ -369,59 +370,64 @@ msgstr ""
 msgid "invalid owner for directory %s"
 msgstr ""
 
-#: ../urpm.pm:258
+#: ../urpm.pm:124
+#, c-format
+msgid "Can not download packages into %s"
+msgstr ""
+
+#: ../urpm.pm:274
 #, c-format
 msgid "unable to open rpmdb"
 msgstr ""
 
-#: ../urpm.pm:272
+#: ../urpm.pm:288
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr ""
 
-#: ../urpm.pm:278
+#: ../urpm.pm:294
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr ""
 
-#: ../urpm.pm:280 ../urpm/get_pkgs.pm:226
+#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
 #, c-format
 msgid "...retrieving done"
 msgstr ""
 
-#: ../urpm.pm:283 ../urpm/download.pm:733 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
-#: ../urpm/media.pm:1474
+#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
+#: ../urpm/media.pm:1486
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr ""
 
-#: ../urpm.pm:288
+#: ../urpm.pm:304
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: ../urpm.pm:293
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr ""
 
-#: ../urpm.pm:301
+#: ../urpm.pm:317
 #, c-format
 msgid "unable to register rpm file"
 msgstr ""
 
-#: ../urpm.pm:303
+#: ../urpm.pm:319
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:307
+#: ../urpm.pm:323
 #, c-format
 msgid "error registering local packages"
 msgstr ""
 
-#: ../urpm.pm:394
+#: ../urpm.pm:410
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
@@ -481,7 +487,7 @@ msgstr ""
 msgid "Too many arguments\n"
 msgstr ""
 
-#: ../urpm/bug_report.pm:48 ../urpmi:258
+#: ../urpm/bug_report.pm:51 ../urpmi:258
 #, c-format
 msgid "Copying failed"
 msgstr ""
@@ -523,127 +529,127 @@ msgstr ""
 msgid "medium `%s' is defined twice, aborting"
 msgstr ""
 
-#: ../urpm/cfg.pm:251 ../urpm/media.pm:486 ../urpm/media.pm:492
+#: ../urpm/cfg.pm:251 ../urpm/media.pm:497 ../urpm/media.pm:503
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr ""
 
-#: ../urpm/download.pm:109
+#: ../urpm/download.pm:113
 #, c-format
 msgid "can not read proxy settings (not enough rights to read %s)"
 msgstr ""
 
-#: ../urpm/download.pm:134
+#: ../urpm/download.pm:138
 #, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr ""
 
-#: ../urpm/download.pm:135
+#: ../urpm/download.pm:139
 #, c-format
 msgid "User name:"
 msgstr ""
 
-#: ../urpm/download.pm:135
+#: ../urpm/download.pm:139
 #, c-format
 msgid "Password:"
 msgstr ""
 
-#: ../urpm/download.pm:219
+#: ../urpm/download.pm:214
 #, c-format
 msgid "Unknown webfetch `%s' !!!\n"
 msgstr ""
 
-#: ../urpm/download.pm:228
+#: ../urpm/download.pm:222
 #, c-format
 msgid "%s failed: exited with signal %d"
 msgstr ""
 
-#: ../urpm/download.pm:229
+#: ../urpm/download.pm:223
 #, c-format
 msgid "%s failed: exited with %d"
 msgstr ""
 
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:252
 #, c-format
 msgid "copy failed"
 msgstr ""
 
-#: ../urpm/download.pm:264
+#: ../urpm/download.pm:258
 #, c-format
 msgid "wget is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:331
+#: ../urpm/download.pm:325
 #, c-format
 msgid "curl is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:456
+#: ../urpm/download.pm:450
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr ""
 
-#: ../urpm/download.pm:495
+#: ../urpm/download.pm:489
 #, c-format
 msgid "rsync is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:563
+#: ../urpm/download.pm:557
 #, c-format
 msgid "ssh is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:582
+#: ../urpm/download.pm:576
 #, c-format
 msgid "prozilla is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:598
+#: ../urpm/download.pm:592
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr ""
 
-#: ../urpm/download.pm:606
+#: ../urpm/download.pm:600
 #, c-format
 msgid "aria2 is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:715
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:719
+#: ../urpm/download.pm:717
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:778
+#: ../urpm/download.pm:782
 #, c-format
 msgid "retrieving %s"
 msgstr ""
 
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:786
 #, c-format
 msgid "retrieved %s"
 msgstr ""
 
-#: ../urpm/download.pm:811
+#: ../urpm/download.pm:834
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr ""
 
-#: ../urpm/download.pm:842
+#: ../urpm/download.pm:862
 #, c-format
 msgid "%s is not available, falling back on %s"
 msgstr ""
 
-#: ../urpm/download.pm:846
+#: ../urpm/download.pm:866
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpm/download.pm:872
+#: ../urpm/download.pm:886
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr ""
@@ -658,12 +664,7 @@ msgstr ""
 msgid "package %s is not found."
 msgstr ""
 
-#: ../urpm/get_pkgs.pm:218
-#, c-format
-msgid "Can not download packages into %s"
-msgstr ""
-
-#: ../urpm/get_pkgs.pm:222
+#: ../urpm/get_pkgs.pm:213
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr ""
@@ -872,244 +873,244 @@ msgstr ""
 msgid "trying to override existing medium \"%s\", skipping"
 msgstr ""
 
-#: ../urpm/media.pm:445
+#: ../urpm/media.pm:456
 #, c-format
 msgid "failed to migrate removable device, ignoring media"
 msgstr ""
 
-#: ../urpm/media.pm:488 ../urpm/media.pm:494
+#: ../urpm/media.pm:499 ../urpm/media.pm:505
 #, c-format
 msgid "wrote config file [%s]"
 msgstr ""
 
-#: ../urpm/media.pm:537
+#: ../urpm/media.pm:548
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 
-#: ../urpm/media.pm:545
+#: ../urpm/media.pm:556
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr ""
 
-#: ../urpm/media.pm:561
+#: ../urpm/media.pm:572
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
 "update, --use-distrib or --parallel"
 msgstr ""
 
-#: ../urpm/media.pm:655
+#: ../urpm/media.pm:666
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr ""
 
-#: ../urpm/media.pm:672
+#: ../urpm/media.pm:683
 #, c-format
 msgid "skipping package %s"
 msgstr ""
 
-#: ../urpm/media.pm:688
+#: ../urpm/media.pm:699
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr ""
 
-#: ../urpm/media.pm:713
+#: ../urpm/media.pm:724
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: ../urpm/media.pm:756
+#: ../urpm/media.pm:767
 #, c-format
 msgid "(ignored by default)"
 msgstr ""
 
-#: ../urpm/media.pm:762
+#: ../urpm/media.pm:773
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:768
+#: ../urpm/media.pm:779
 #, c-format
 msgid "adding medium \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:797
+#: ../urpm/media.pm:808
 #, c-format
 msgid "directory %s does not exist"
 msgstr ""
 
-#: ../urpm/media.pm:805
+#: ../urpm/media.pm:816
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr ""
 
-#: ../urpm/media.pm:823
+#: ../urpm/media.pm:834
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr ""
 
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:837
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr ""
 
-#: ../urpm/media.pm:844
+#: ../urpm/media.pm:855
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:896
+#: ../urpm/media.pm:907
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr ""
 
-#: ../urpm/media.pm:937
+#: ../urpm/media.pm:948
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:951
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr ""
 
-#: ../urpm/media.pm:960
+#: ../urpm/media.pm:971
 #, c-format
 msgid "removing medium \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:1043
+#: ../urpm/media.pm:1055
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1089
 #, c-format
 msgid "...reconfiguration failed"
 msgstr ""
 
-#: ../urpm/media.pm:1083
+#: ../urpm/media.pm:1095
 #, c-format
 msgid "reconfiguration done"
 msgstr ""
 
-#: ../urpm/media.pm:1099
+#: ../urpm/media.pm:1111
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr ""
 
-#: ../urpm/media.pm:1120
+#: ../urpm/media.pm:1132
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr ""
 
-#: ../urpm/media.pm:1131
+#: ../urpm/media.pm:1143
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr ""
 
-#: ../urpm/media.pm:1151
+#: ../urpm/media.pm:1163
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
+#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr ""
 
-#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
+#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
 #, c-format
 msgid "...copying failed"
 msgstr ""
 
-#: ../urpm/media.pm:1217
+#: ../urpm/media.pm:1229
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr ""
 
-#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
+#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
 #, c-format
 msgid "...copying done"
 msgstr ""
 
-#: ../urpm/media.pm:1253
+#: ../urpm/media.pm:1265
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
 
-#: ../urpm/media.pm:1298
+#: ../urpm/media.pm:1310
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr ""
 
-#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
+#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr ""
 
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1327
 #, c-format
 msgid "genhdlist2 failed on %s"
 msgstr ""
 
-#: ../urpm/media.pm:1325
+#: ../urpm/media.pm:1337
 #, c-format
 msgid "comparing %s and %s"
 msgstr ""
 
-#: ../urpm/media.pm:1350
+#: ../urpm/media.pm:1362
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:1376
+#: ../urpm/media.pm:1388
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr ""
 
-#: ../urpm/media.pm:1418
+#: ../urpm/media.pm:1430
 #, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr ""
 
-#: ../urpm/media.pm:1449
+#: ../urpm/media.pm:1461
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr ""
 
-#: ../urpm/media.pm:1466
+#: ../urpm/media.pm:1478
 #, c-format
 msgid "found probed synthesis as %s"
 msgstr ""
 
-#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
+#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:1524
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr ""
 
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1548
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:1540
+#: ../urpm/media.pm:1552
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:1614
+#: ../urpm/media.pm:1626
 #, c-format
 msgid "updated medium \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:1734
+#: ../urpm/media.pm:1746
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1119,17 +1120,17 @@ msgstr ""
 msgid "trying again with mirror %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:52
+#: ../urpm/mirrors.pm:71
 #, c-format
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:181
+#: ../urpm/mirrors.pm:194
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:226
+#: ../urpm/mirrors.pm:239
 #, c-format
 msgid "getting mirror list from %s"
 msgstr ""
@@ -1294,551 +1295,552 @@ msgstr ""
 msgid "unmounting %s"
 msgstr ""
 
-#: ../urpm/select.pm:28
+#: ../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:30
+#: ../urpm/search.pm:36 ../urpmf:36
 #, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgid "  --version      - print this tool's version number.\n"
 msgstr ""
 
-#: ../urpm/select.pm:168
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
-msgid "No package named %s"
+msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
 #, c-format
-msgid "The following packages contain %s: %s"
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpm/select.pm:172
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
-msgid "You should use \"-a\" to use all of them"
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpm/select.pm:300
+#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
+#: ../urpmi.update:48 ../urpmq:70
 #, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
 msgstr ""
 
-#: ../urpm/select.pm:543
+#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
 #, c-format
-msgid "Package %s is already installed"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 
-#: ../urpm/select.pm:544
+#: ../urpm/search.pm:43 ../urpmf:43
 #, c-format
-msgid "Packages %s are already installed"
+msgid "  --use-distrib  - use the given path to access media\n"
 msgstr ""
 
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
 #, c-format
-msgid "due to missing %s"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpm/select.pm:563
+#: ../urpm/search.pm:45 ../urpmf:45
 #, c-format
-msgid "due to already installed %s"
+msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr ""
 
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
-msgid "due to unsatisfied %s"
+msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: ../urpm/select.pm:570
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
-msgid "trying to promote %s"
+msgid "  --verbose      - verbose mode.\n"
 msgstr ""
 
-#: ../urpm/select.pm:571
+#: ../urpm/search.pm:48 ../urpmf:48
 #, c-format
-msgid "in order to keep %s"
+msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr ""
 
-#: ../urpm/select.pm:607
+#: ../urpm/search.pm:49 ../urpmf:49
 #, c-format
-msgid "in order to install %s"
+msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr ""
 
-#: ../urpm/select.pm:617
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
-msgid "due to conflicts with %s"
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
-#: ../urpm/signature.pm:29
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
-msgid "Invalid signature (%s)"
+msgid "Pattern expressions:\n"
 msgstr ""
 
-#: ../urpm/signature.pm:60
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
-msgid "Invalid Key ID (%s)"
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
-#: ../urpm/signature.pm:62
+#: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
-msgid "Missing signature (%s)"
+msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpm/sys.pm:156
+#: ../urpm/search.pm:54 ../urpmf:54
 #, c-format
-msgid "system"
+msgid "  -a             - binary AND operator.\n"
 msgstr ""
 
-#: ../urpm/sys.pm:191
+#: ../urpm/search.pm:55 ../urpmf:55
 #, c-format
-msgid "You should restart %s for %s"
+msgid "  -o             - binary OR operator.\n"
 msgstr ""
 
-#: ../urpm/sys.pm:276
+#: ../urpm/search.pm:56 ../urpmf:56
 #, c-format
-msgid "Can't write file"
+msgid "  !              - unary NOT.\n"
 msgstr ""
 
-#: ../urpm/sys.pm:276
+#: ../urpm/search.pm:57 ../urpmf:57
 #, c-format
-msgid "Can't open file"
+msgid "  ( )            - left and right parentheses.\n"
 msgstr ""
 
-#: ../urpm/sys.pm:289
+#: ../urpm/search.pm:58 ../urpmf:58
 #, c-format
-msgid "Can't move file %s to %s"
+msgid "List of tags:\n"
 msgstr ""
 
-#: ../urpme:41
+#: ../urpm/search.pm:59 ../urpmf:59
 #, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
+msgid "  --qf           - specify a printf-like output format\n"
 msgstr ""
 
-#: ../urpme:47
+#: ../urpm/search.pm:60 ../urpmf:60
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
+msgid "                   example: '%%name:%%files'\n"
 msgstr ""
 
-#: ../urpme:48
+#: ../urpm/search.pm:61 ../urpmf:61
 #, c-format
-msgid "  --auto-orphans - remove orphans\n"
+msgid "  --arch         - architecture\n"
 msgstr ""
 
-#: ../urpme:49
+#: ../urpm/search.pm:62 ../urpmf:62
 #, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgid "  --buildhost    - build host\n"
 msgstr ""
 
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgid "  --buildtime    - build time\n"
 msgstr ""
 
-#: ../urpme:52 ../urpmi:141
+#: ../urpm/search.pm:64 ../urpmf:64
 #, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
+msgid "  --conffiles    - configuration files\n"
 msgstr ""
 
-#: ../urpme:53
+#: ../urpm/search.pm:65 ../urpmf:65
 #, c-format
-msgid "  --root         - use another root for rpm removal.\n"
+msgid "  --conflicts    - conflict tags\n"
 msgstr ""
 
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#: ../urpm/search.pm:66 ../urpmf:66
 #, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgid "  --description  - package description\n"
 msgstr ""
 
-#: ../urpme:55 ../urpmi:101
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgid "  --distribution - distribution\n"
 msgstr ""
 
-#: ../urpme:56
+#: ../urpm/search.pm:68 ../urpmf:68
 #, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgid "  --epoch        - epoch\n"
 msgstr ""
 
-#: ../urpme:57
+#: ../urpm/search.pm:69 ../urpmf:69
 #, 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 "  --filename     - filename of the package\n"
 msgstr ""
 
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpm/search.pm:70 ../urpmf:70
 #, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
+msgid "  --files        - list of files contained in the package\n"
 msgstr ""
 
-#: ../urpme:60
+#: ../urpm/search.pm:71 ../urpmf:71
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
+msgid "  --group        - group\n"
 msgstr ""
 
-#: ../urpme:73
+#: ../urpm/search.pm:72 ../urpmf:72
 #, c-format
-msgid "Only superuser is allowed to remove packages"
+msgid "  --license      - license\n"
 msgstr ""
 
-#: ../urpme:106
+#: ../urpm/search.pm:73 ../urpmf:73
 #, c-format
-msgid "unknown packages"
+msgid "  --name         - package name\n"
 msgstr ""
 
-#: ../urpme:106
+#: ../urpm/search.pm:74 ../urpmf:74
 #, c-format
-msgid "unknown package"
+msgid "  --obsoletes    - obsoletes tags\n"
 msgstr ""
 
-#: ../urpme:121
+#: ../urpm/search.pm:75 ../urpmf:75
 #, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] ""
-msgstr[1] ""
+msgid "  --packager     - packager\n"
+msgstr ""
 
-#: ../urpme:126
+#: ../urpm/search.pm:76 ../urpmf:76
 #, c-format
-msgid "Nothing to remove"
+msgid "  --provides     - provides tags\n"
 msgstr ""
 
-#: ../urpme:143
+#: ../urpm/search.pm:77 ../urpmf:77
 #, c-format
-msgid "No orphans to remove"
+msgid "  --requires     - requires tags\n"
 msgstr ""
 
-#: ../urpme:149
+#: ../urpm/search.pm:78 ../urpmf:78
 #, 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 "  --size         - installed size\n"
+msgstr ""
 
-#: ../urpme:154
+#: ../urpm/search.pm:79 ../urpmf:79
 #, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] ""
-msgstr[1] ""
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr ""
 
-#: ../urpme:161
+#: ../urpm/search.pm:80 ../urpmf:80
 #, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] ""
-msgstr[1] ""
+msgid "  --suggests     - suggests tags\n"
+msgstr ""
 
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpm/search.pm:81 ../urpmf:81
 #, c-format
-msgid " (y/N) "
+msgid "  --summary      - summary\n"
 msgstr ""
 
-#: ../urpme:166
+#: ../urpm/search.pm:82 ../urpmf:82
 #, c-format
-msgid "testing removal of %s"
+msgid "  --url          - url\n"
 msgstr ""
 
-#: ../urpme:181
+#: ../urpm/search.pm:83 ../urpmf:83
 #, c-format
-msgid "Removal failed"
+msgid "  --vendor       - vendor\n"
 msgstr ""
 
-#: ../urpme:183
+#: ../urpm/search.pm:84 ../urpmf:84
 #, c-format
-msgid "Removal is possible"
+msgid "  -m             - the media in which the package was found\n"
 msgstr ""
 
-#: ../urpmf:29
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
 #, 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 "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: ../urpmf:36
+#: ../urpm/search.pm:197 ../urpmf:198
 #, c-format
-msgid "  --version      - print this tool's version number.\n"
+msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
+msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../urpm/search.pm:290 ../urpmf:291
 #, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgid "no hdlist available for medium \"%s\""
 msgstr ""
 
-#: ../urpmf:39
+#: ../urpm/search.pm:297 ../urpmf:298
 #, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgid "no synthesis available for medium \"%s\""
 msgstr ""
 
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../urpm/search.pm:304 ../urpmf:307
 #, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgid "no xml-info available for medium \"%s\""
 msgstr ""
 
-#: ../urpmf:43
+#: ../urpm/select.pm:28
 #, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
+msgid "urpmi was restarted, and the list of priority packages did not change"
 msgstr ""
 
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../urpm/select.pm:30
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
 msgstr ""
 
-#: ../urpmf:45
+#: ../urpm/select.pm:168
 #, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
+msgid "No package named %s"
 msgstr ""
 
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../urpm/select.pm:170 ../urpme:115
 #, c-format
-msgid "  --update       - use only update media.\n"
+msgid "The following packages contain %s: %s"
 msgstr ""
 
-#: ../urpmf:47
+#: ../urpm/select.pm:172
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
+msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpmf:48
+#: ../urpm/select.pm:300
 #, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
+msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr ""
 
-#: ../urpmf:49
+#: ../urpm/select.pm:543
 #, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgid "Package %s is already installed"
 msgstr ""
 
-#: ../urpmf:50
+#: ../urpm/select.pm:544
 #, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgid "Packages %s are already installed"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
 #, c-format
-msgid "Pattern expressions:\n"
+msgid "due to missing %s"
 msgstr ""
 
-#: ../urpmf:52
+#: ../urpm/select.pm:563
 #, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgid "due to already installed %s"
 msgstr ""
 
-#: ../urpmf:53
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
+msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpmf:54
+#: ../urpm/select.pm:570
 #, c-format
-msgid "  -a             - binary AND operator.\n"
+msgid "trying to promote %s"
 msgstr ""
 
-#: ../urpmf:55
+#: ../urpm/select.pm:571
 #, c-format
-msgid "  -o             - binary OR operator.\n"
+msgid "in order to keep %s"
 msgstr ""
 
-#: ../urpmf:56
+#: ../urpm/select.pm:607
 #, c-format
-msgid "  !              - unary NOT.\n"
+msgid "in order to install %s"
 msgstr ""
 
-#: ../urpmf:57
+#: ../urpm/select.pm:617
 #, c-format
-msgid "  ( )            - left and right parentheses.\n"
+msgid "due to conflicts with %s"
 msgstr ""
 
-#: ../urpmf:58
+#: ../urpm/signature.pm:29
 #, c-format
-msgid "List of tags:\n"
+msgid "Invalid signature (%s)"
 msgstr ""
 
-#: ../urpmf:59
+#: ../urpm/signature.pm:60
 #, c-format
-msgid "  --qf           - specify a printf-like output format\n"
+msgid "Invalid Key ID (%s)"
 msgstr ""
 
-#: ../urpmf:60
+#: ../urpm/signature.pm:62
 #, c-format
-msgid "                   example: '%%name:%%files'\n"
+msgid "Missing signature (%s)"
 msgstr ""
 
-#: ../urpmf:61
+#: ../urpm/sys.pm:156
 #, c-format
-msgid "  --arch         - architecture\n"
+msgid "system"
 msgstr ""
 
-#: ../urpmf:62
+#: ../urpm/sys.pm:191
 #, c-format
-msgid "  --buildhost    - build host\n"
+msgid "You should restart %s for %s"
 msgstr ""
 
-#: ../urpmf:63
+#: ../urpm/sys.pm:276
 #, c-format
-msgid "  --buildtime    - build time\n"
+msgid "Can't write file"
 msgstr ""
 
-#: ../urpmf:64
+#: ../urpm/sys.pm:276
 #, c-format
-msgid "  --conffiles    - configuration files\n"
+msgid "Can't open file"
 msgstr ""
 
-#: ../urpmf:65
+#: ../urpm/sys.pm:289
 #, c-format
-msgid "  --conflicts    - conflict tags\n"
+msgid "Can't move file %s to %s"
 msgstr ""
 
-#: ../urpmf:66
+#: ../urpme:41
 #, c-format
-msgid "  --description  - package description\n"
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
 
-#: ../urpmf:67
+#: ../urpme:47
 #, c-format
-msgid "  --distribution - distribution\n"
+msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 
-#: ../urpmf:68
+#: ../urpme:48
 #, c-format
-msgid "  --epoch        - epoch\n"
+msgid "  --auto-orphans - remove orphans\n"
 msgstr ""
 
-#: ../urpmf:69
+#: ../urpme:49
 #, c-format
-msgid "  --filename     - filename of the package\n"
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr ""
 
-#: ../urpmf:70
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
 #, c-format
-msgid "  --files        - list of files contained in the package\n"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 
-#: ../urpmf:71
+#: ../urpme:52 ../urpmi:141
 #, c-format
-msgid "  --group        - group\n"
+msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr ""
 
-#: ../urpmf:72
+#: ../urpme:53
 #, c-format
-msgid "  --license      - license\n"
+msgid "  --root         - use another root for rpm removal.\n"
 msgstr ""
 
-#: ../urpmf:73
+#: ../urpme:55 ../urpmi:101
 #, c-format
-msgid "  --name         - package name\n"
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
 msgstr ""
 
-#: ../urpmf:74
+#: ../urpme:56
 #, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr ""
 
-#: ../urpmf:75
+#: ../urpme:57
 #, c-format
-msgid "  --packager     - packager\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:76
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
 #, c-format
-msgid "  --provides     - provides tags\n"
+msgid "  --verbose, -v  - verbose mode.\n"
 msgstr ""
 
-#: ../urpmf:77
+#: ../urpme:60
 #, c-format
-msgid "  --requires     - requires tags\n"
+msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpmf:78
+#: ../urpme:73
 #, c-format
-msgid "  --size         - installed size\n"
+msgid "Only superuser is allowed to remove packages"
 msgstr ""
 
-#: ../urpmf:79
+#: ../urpme:106
 #, c-format
-msgid "  --sourcerpm    - source rpm name\n"
+msgid "unknown packages"
 msgstr ""
 
-#: ../urpmf:80
+#: ../urpme:106
 #, c-format
-msgid "  --suggests     - suggests tags\n"
+msgid "unknown package"
 msgstr ""
 
-#: ../urpmf:81
+#: ../urpme:121
 #, c-format
-msgid "  --summary      - summary\n"
-msgstr ""
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../urpmf:82
+#: ../urpme:126
 #, c-format
-msgid "  --url          - url\n"
+msgid "Nothing to remove"
 msgstr ""
 
-#: ../urpmf:83
+#: ../urpme:143
 #, c-format
-msgid "  --vendor       - vendor\n"
+msgid "No orphans to remove"
 msgstr ""
 
-#: ../urpmf:84
+#: ../urpme:149
 #, c-format
-msgid "  -m             - the media in which the package was found\n"
-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:85 ../urpmq:99
+#: ../urpme:154
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../urpmf:153
+#: ../urpme:161
 #, c-format
-msgid "unterminated expression (%s)"
-msgstr ""
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../urpmf:198
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
 #, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
+msgid " (y/N) "
 msgstr ""
 
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
+#: ../urpme:166
 #, c-format
-msgid "using specific environment on %s\n"
+msgid "testing removal of %s"
 msgstr ""
 
-#: ../urpmf:291
+#: ../urpme:181
 #, c-format
-msgid "no hdlist available for medium \"%s\""
+msgid "Removal failed"
 msgstr ""
 
-#: ../urpmf:298
+#: ../urpme:183
 #, c-format
-msgid "no synthesis available for medium \"%s\""
+msgid "Removal is possible"
 msgstr ""
 
-#: ../urpmf:307
+#: ../urpmf:153
 #, c-format
-msgid "no xml-info available for medium \"%s\""
+msgid "unterminated expression (%s)"
 msgstr ""
 
 #: ../urpmi:81